Used zap's stacktrace capturing in 'recover'.

wavesplatform · Jan 3, 2024 · 517803a · 517803a
1 parent 7a5ae6e
commit 517803a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/cmd/bots/discord/discord.go b/cmd/bots/discord/discord.go
@@ -6,7 +6,6 @@ import (
 	"log"
 	"os"
 	"os/signal"
-	"runtime/debug"
 	"syscall"
 	"time"
 
@@ -80,13 +79,9 @@ func (c *discordBotConfig) validate(zap *zap.Logger) error {
 func handleRecover(logger *zap.Logger) {
 	if r := recover(); r != nil {
 		if rErr, ok := r.(error); ok {
-			logger.Fatal("Panic has been occurred", zap.ByteString("stacktrace", debug.Stack()),
-				zap.Error(rErr),
-			)
+			logger.Fatal("Panic has been occurred", zap.Stack("stacktrace"), zap.Error(rErr))
 		} else {
-			logger.Fatal("Panic has been occurred", zap.ByteString("stacktrace", debug.Stack()),
-				zap.Any("recovered-data", r),
-			)
+			logger.Fatal("Panic has been occurred", zap.Stack("stacktrace"), zap.Any("recovered-data", r))
 		}
 	}
 }

diff --git a/cmd/bots/telegram/telegram.go b/cmd/bots/telegram/telegram.go
@@ -7,7 +7,6 @@ import (
 	"log"
 	"os"
 	"os/signal"
-	"runtime/debug"
 	"syscall"
 	"time"
 
@@ -101,13 +100,9 @@ func (c *telegramBotConfig) validate(logger *zap.Logger) error {
 func handleRecover(logger *zap.Logger) {
 	if r := recover(); r != nil {
 		if rErr, ok := r.(error); ok {
-			logger.Fatal("Panic has been occurred", zap.ByteString("stacktrace", debug.Stack()),
-				zap.Error(rErr),
-			)
+			logger.Fatal("Panic has been occurred", zap.Stack("stacktrace"), zap.Error(rErr))
 		} else {
-			logger.Fatal("Panic has been occurred", zap.ByteString("stacktrace", debug.Stack()),
-				zap.Any("recovered-data", r),
-			)
+			logger.Fatal("Panic has been occurred", zap.Stack("stacktrace"), zap.Any("recovered-data", r))
 		}
 	}
 }

diff --git a/cmd/nodemon/nodemon.go b/cmd/nodemon/nodemon.go
@@ -7,7 +7,6 @@ import (
 	"log"
 	"os"
 	"os/signal"
-	"runtime/debug"
 	"strings"
 	"syscall"
 	"time"
@@ -184,13 +183,9 @@ func (c *nodemonConfig) runTelegramPairServer() bool { return c.nanomsgPairTeleg
 func handleRecover(logger *zap.Logger) {
 	if r := recover(); r != nil {
 		if rErr, ok := r.(error); ok {
-			logger.Fatal("Panic has been occurred", zap.ByteString("stacktrace", debug.Stack()),
-				zap.Error(rErr),
-			)
+			logger.Fatal("Panic has been occurred", zap.Stack("stacktrace"), zap.Error(rErr))
 		} else {
-			logger.Fatal("Panic has been occurred", zap.ByteString("stacktrace", debug.Stack()),
-				zap.Any("recovered-data", r),
-			)
+			logger.Fatal("Panic has been occurred", zap.Stack("stacktrace"), zap.Any("recovered-data", r))
 		}
 	}
 }