Fix: modified the format of error and added yellow color for warn level

containerish · Mar 26, 2022 · 72373c0 · 72373c0
1 parent 2d88371
commit 72373c0
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/telemetry/consoleWriter.go b/telemetry/consoleWriter.go
@@ -15,7 +15,7 @@ import (
 
 func (l logger) consoleWriter(ctx echo.Context) {
 	l.zlog = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC822})
-	l.zlog = l.zlog.With().Caller().Logger()
+	l.zlog = l.zlog.With().Logger()
 
 	buf := l.pool.Get().(*bytes.Buffer)
 	buf.Reset()
@@ -37,12 +37,29 @@ func (l logger) consoleWriter(ctx echo.Context) {
 
 	var e multierror.Error
 
-	_, err := buf.WriteString(req.Host + " ")
+	_, err := buf.WriteString(req.Method + " ")
 	if err != nil {
 		e.Errors = append(e.Errors, err)
 	}
 
-	_, err = buf.WriteString(req.Method + " ")
+	if level == zerolog.InfoLevel {
+		_, err = buf.WriteString(color.GreenString("%d ", res.Status))
+		if err != nil {
+			e.Errors = append(e.Errors, err)
+		}
+	} else if level == zerolog.WarnLevel {
+		_, err = buf.WriteString(color.YellowString("%d ", res.Status))
+		if err != nil {
+			e.Errors = append(e.Errors, err)
+		}
+	} else {
+		_, err = buf.WriteString(color.RedString("%d ", res.Status))
+		if err != nil {
+			e.Errors = append(e.Errors, err)
+		}
+	}
+
+	_, err = buf.WriteString(req.Host)
 	if err != nil {
 		e.Errors = append(e.Errors, err)
 	}
@@ -62,18 +79,6 @@ func (l logger) consoleWriter(ctx echo.Context) {
 		e.Errors = append(e.Errors, err)
 	}
 
-	if level == zerolog.InfoLevel {
-		_, err = buf.WriteString(color.GreenString(" %d", res.Status))
-		if err != nil {
-			e.Errors = append(e.Errors, err)
-		}
-	} else {
-		_, err = buf.WriteString(color.RedString(" %d", res.Status))
-		if err != nil {
-			e.Errors = append(e.Errors, err)
-		}
-	}
-
 	if ctxErr, ok := ctx.Get(types.HttpEndpointErrorKey).(string); ok {
 		_, err = buf.WriteString(color.YellowString(" %s", ctxErr))
 		if err != nil {