From a31c615d7c4c1e578c2635370a90ea36a7153833 Mon Sep 17 00:00:00 2001 From: jano3 <jano@bob.co.za> Date: Thu, 15 Feb 2024 12:44:38 +0200 Subject: [PATCH] Add log levels and time to logs --- logs/logs.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/logs/logs.go b/logs/logs.go index f55fa6f..37bd7f0 100644 --- a/logs/logs.go +++ b/logs/logs.go @@ -4,7 +4,9 @@ import ( "bytes" "encoding/json" "fmt" + "github.com/MindscapeHQ/raygun4go" log "github.com/sirupsen/logrus" + "gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/date_utils" "gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/errors" "gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/string_utils" "gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/utils" @@ -17,11 +19,17 @@ import ( "runtime" "strings" - "github.com/MindscapeHQ/raygun4go" - "github.com/aws/aws-lambda-go/events" ) +const ( + FatalLevel = log.FatalLevel + ErrorLevel = log.ErrorLevel + WarnLevel = log.WarnLevel + InfoLevel = log.InfoLevel + DebugLevel = log.DebugLevel +) + type LogEntryWithLevel struct { //LogBuffer *bytes.Buffer LogEntry *log.Entry @@ -133,6 +141,10 @@ func InitLogs(requestID *string, isDebugBuild bool, buildVersion string, request } } +func SetLevel(logLevel log.Level) { + log.SetLevel(logLevel) +} + func LogLevel() log.Level { logLevelString := os.Getenv("LOG_LEVEL") @@ -526,8 +538,10 @@ func storeLogEntry(logEntry *log.Entry, message interface{}, logLevel log.Level) if logEntry != nil && logEntry.Logger != nil && logEntry.Logger.IsLevelEnabled(logLevel) { + logWithTime := logEntry.WithField("log_time", date_utils.CurrentDate()) + cachedLogEntries = append(cachedLogEntries, LogEntryWithLevel{ - LogEntry: logEntry, + LogEntry: logWithTime, Message: message, LogLevel: logLevel, }) -- GitLab