fix(cli): reading log level from env var

Author: fiftin

api/sockets/handler.go

@@ -48,6 +48,13 @@ func (c *connection) logError(err error, msg string) {
 	}).Error(msg)
 }
 
+func (c *connection) debugError(err error, msg string) {
+	log.WithError(err).WithFields(log.Fields{
+		"context": "websocket",
+		"user_id": c.userID,
+	}).Debug(msg)
+}
+
 // readPump pumps messages from the websocket connection to the hub.
 func (c *connection) readPump() {
 	defer func() {
@@ -104,17 +111,17 @@ func (c *connection) writePump() {
 		case message, ok := <-c.send:
 			if !ok {
 				if err := c.write(websocket.CloseMessage, []byte{}); err != nil {
-					c.logError(err, "Cannot send close message")
+					c.debugError(err, "Cannot send close message")
 				}
 				return
 			}
 
 			if err := c.write(websocket.TextMessage, message); err != nil {
-				c.logError(err, "Cannot send message")
+				c.debugError(err, "Cannot send message")
 			}
 		case <-ticker.C:
 			if err := c.write(websocket.PingMessage, []byte{}); err != nil {
-				c.logError(err, "Cannot send ping message")
+				c.debugError(err, "Cannot send ping message")
 				return
 			}
 		}

cli/cmd/root.go

@@ -36,28 +36,22 @@ Complete documentation is available at https://semaphoreui.com.`,
 		_ = cmd.Help()
 		os.Exit(0)
 	},
+
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		if persistentFlags.logLevel == "" {
-			return
+		str := persistentFlags.logLevel
+		if str == "" {
+			str = os.Getenv("SEMAPHORE_LOG_LEVEL")
 		}
-
-		lvl := log.InfoLevel
-		var err error
-
-		if os.Getenv("SEMAPHORE_LOG_LEVEL") != "" {
-			lvl, err = log.ParseLevel(os.Getenv("SEMAPHORE_LOG_LEVEL"))
-			if err != nil {
-				log.Panic(err)
-			}
+		if str == "" {
+			return
 		}
 
-		if persistentFlags.logLevel != "" {
-			lvl, err = log.ParseLevel(persistentFlags.logLevel)
-			if err != nil {
-				log.Panic(err)
-			}
+		lvl, err := log.ParseLevel(str)
+		if err != nil {
+			log.Panic(err)
 		}
 
+		fmt.Println("Log level set to", lvl)
 		log.SetLevel(lvl)
 	},
 }