From f2bed6d5aa719defa95e7c8baae138b883708351 Mon Sep 17 00:00:00 2001
From: Pouya <pouya@kenshi.io>
Date: Mon, 8 Apr 2024 11:07:52 +0200
Subject: [PATCH] Improve log messages

---
 internal/cmd/broker.go                           | 3 ++-
 internal/cmd/consumer.go                         | 3 ++-
 internal/cmd/worker.go                           | 3 ++-
 internal/scheduler/scheduler.go                  | 4 +++-
 internal/transport/client/client.go              | 4 ++--
 internal/transport/client/conn/conn.go           | 4 +++-
 internal/transport/server/server.go              | 4 +++-
 internal/transport/server/websocket/websocket.go | 4 ++--
 8 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/internal/cmd/broker.go b/internal/cmd/broker.go
index 53b52b23..a69ed1c4 100644
--- a/internal/cmd/broker.go
+++ b/internal/cmd/broker.go
@@ -20,9 +20,10 @@ var brokerCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Start(config.App.System.Log)
 		log.Logger.
+			With("Mode", "Broker").
 			With("Version", constants.Version).
 			With("Protocol", constants.ProtocolVersion).
-			Info("Running Unchained | Broker")
+			Info("Running Unchained")
 
 		err := config.Load(configPath, secretsPath)
 		if err != nil {
diff --git a/internal/cmd/consumer.go b/internal/cmd/consumer.go
index ba7e123f..cfc0a372 100644
--- a/internal/cmd/consumer.go
+++ b/internal/cmd/consumer.go
@@ -32,9 +32,10 @@ var consumerCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Start(config.App.System.Log)
 		log.Logger.
+			With("Mode", "Consumer").
 			With("Version", constants.Version).
 			With("Protocol", constants.ProtocolVersion).
-			Info("Running Unchained | Consumer")
+			Info("Running Unchained")
 
 		err := config.Load(configPath, secretsPath)
 		if err != nil {
diff --git a/internal/cmd/worker.go b/internal/cmd/worker.go
index 12c4d5ae..bf62b268 100644
--- a/internal/cmd/worker.go
+++ b/internal/cmd/worker.go
@@ -30,9 +30,10 @@ var workerCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Start(config.App.System.Log)
 		log.Logger.
+			With("Mode", "Worker").
 			With("Version", constants.Version).
 			With("Protocol", constants.ProtocolVersion).
-			Info("Running Unchained | Worker")
+			Info("Running Unchained ")
 
 		err := config.Load(configPath, secretsPath)
 		if err != nil {
diff --git a/internal/scheduler/scheduler.go b/internal/scheduler/scheduler.go
index eac3aadb..40b87b57 100644
--- a/internal/scheduler/scheduler.go
+++ b/internal/scheduler/scheduler.go
@@ -80,7 +80,9 @@ func WithUniswapEvents(
 }
 
 func (s *Scheduler) AddTask(duration time.Duration, task Task) {
-	log.Logger.With("duration", duration).Info("Register a new task")
+	log.Logger.
+		With("duration", duration).
+		Info("New UniSwap task scheduled.")
 
 	_, err := s.scheduler.NewJob(
 		gocron.DurationJob(duration),
diff --git a/internal/transport/client/client.go b/internal/transport/client/client.go
index b9a01c7c..096cb170 100644
--- a/internal/transport/client/client.go
+++ b/internal/transport/client/client.go
@@ -23,7 +23,7 @@ func Consume(handler handler.Handler) {
 			case opcodes.Feedback:
 				log.Logger.
 					With("Feedback", string(payload[1:])).
-					Warn("Broker")
+					Info("Broker")
 
 			case opcodes.KoskChallenge:
 				challenge := handler.Challenge(payload[1:])
@@ -41,7 +41,7 @@ func Consume(handler handler.Handler) {
 			default:
 				log.Logger.
 					With("Code", payload[0]).
-					Info("Unknown call code")
+					Error("Unknown call code")
 			}
 		}
 	}()
diff --git a/internal/transport/client/conn/conn.go b/internal/transport/client/conn/conn.go
index 43e914ae..4b162404 100644
--- a/internal/transport/client/conn/conn.go
+++ b/internal/transport/client/conn/conn.go
@@ -21,7 +21,9 @@ var mu = new(sync.Mutex)
 func Start() {
 	var err error
 
-	log.Logger.With("URL", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion)).Info("Connecting to broker")
+	log.Logger.
+		With("URL", fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion)).
+		Info("Connecting to the broker")
 
 	conn, _, err = websocket.DefaultDialer.Dial(
 		fmt.Sprintf("%s/%s", config.App.Network.BrokerURI, constants.ProtocolVersion), nil,
diff --git a/internal/transport/server/server.go b/internal/transport/server/server.go
index f079dd61..aab77641 100644
--- a/internal/transport/server/server.go
+++ b/internal/transport/server/server.go
@@ -13,7 +13,9 @@ func New(options ...func()) {
 		option()
 	}
 
-	log.Logger.With("Bind", fmt.Sprintf("http://%s", config.App.Network.Bind)).Info("Server is starting")
+	log.Logger.
+		With("Bind", fmt.Sprintf("http://%s", config.App.Network.Bind)).
+		Info("Starting a HTTP server")
 
 	server := &http.Server{
 		Addr:              config.App.Network.Bind,
diff --git a/internal/transport/server/websocket/websocket.go b/internal/transport/server/websocket/websocket.go
index d71483dd..05b4b549 100644
--- a/internal/transport/server/websocket/websocket.go
+++ b/internal/transport/server/websocket/websocket.go
@@ -17,7 +17,7 @@ var upgrader = websocket.Upgrader{}
 
 func WithWebsocket() func() {
 	return func() {
-		log.Logger.Info("Websocket is activated")
+		log.Logger.Info("Starting a websocket server")
 
 		versionedRoot := fmt.Sprintf("/%s", constants.ProtocolVersion)
 		http.HandleFunc(versionedRoot, multiplexer)
@@ -27,7 +27,7 @@ func WithWebsocket() func() {
 func multiplexer(w http.ResponseWriter, r *http.Request) {
 	conn, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
-		log.Logger.Error("Can't upgrade connection: %v", err)
+		log.Logger.Error("Can't upgrade the HTTP connection: %v", err)
 		return
 	}