From 7ae7047deb7f8f0d6f75bb4698b7f3e2d00b3224 Mon Sep 17 00:00:00 2001 From: Gary Holtz Date: Fri, 18 Jun 2021 13:57:09 -0500 Subject: Adding a UTC converter and test --- internal/logger/logger.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'internal/logger/logger.go') 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{}}) } } -- cgit v1.2.1