Merge branch '140-standardize-logging-timestamp-format' into 'main'

Standardize logging timestamp format

Closes #140

See merge request gitlab-org/gitlab-shell!485

1 files changed, 13 insertions, 1 deletions

diff --git a/internal/logger/logger.go b/internal/logger/logger.go
index 651aa08..4e735e7 100644
--- a/internal/logger/logger.go
+++ b/internal/logger/logger.go
@@ -10,9 +10,21 @@ import (
 	"gitlab.com/gitlab-org/gitlab-shell/internal/config"
 )
 
+type UTCFormatter struct {
+	log.Formatter
+}
+
+func (u UTCFormatter) Format(e *log.Entry) ([]byte, error) {
+	e.Time = e.Time.UTC()
+
+	return u.Formatter.Format(e)
+}
+
 func configureLogFormat(cfg *config.Config) {
 	if cfg.LogFormat == "json" {
-		log.SetFormatter(&log.JSONFormatter{})
+		log.SetFormatter(UTCFormatter{&log.JSONFormatter{}})
+	} else {
+		log.SetFormatter(UTCFormatter{&log.TextFormatter{}})
 	}
 }