From 46a47e7cd51d3374c6668e3d5d994f969b572d89 Mon Sep 17 00:00:00 2001 From: Levente Batuska Date: Mon, 20 Jan 2025 21:48:47 +0100 Subject: [PATCH] feat(Logger): add WriteErrMsgRequest and WriteErrMsgRequestDebug functions --- logger/consolelogger.go | 8 ++++++++ logger/filelogger.go | 28 ++++++++++++++++++++++++++++ logger/interfaces.go | 4 ++++ logger/nulllogger.go | 14 ++++++++++++++ logger/sloglogger.go | 18 ++++++++++++++++++ 5 files changed, 72 insertions(+) diff --git a/logger/consolelogger.go b/logger/consolelogger.go index 1431602..bd33137 100644 --- a/logger/consolelogger.go +++ b/logger/consolelogger.go @@ -48,6 +48,14 @@ func (logger *ConsoleLoggerImpl) WriteErrRequest(err error, uuid string) (errnum return errnum } +func (logger *ConsoleLoggerImpl) WriteErrMsgRequest(err error, message string, uuid string) (errnum int) { + if err != nil { + logger.Write(uuid + " " + message + ": Error: " + err.Error()) + errnum = 1 + } + return errnum +} + func (logger *ConsoleLoggerImpl) WriteDebug(message string) { if DEBUG { logger.Write(message) diff --git a/logger/filelogger.go b/logger/filelogger.go index a49e596..f4e39a2 100644 --- a/logger/filelogger.go +++ b/logger/filelogger.go @@ -96,6 +96,14 @@ func (logger *FileLoggerImpl) WriteErrRequest(err error, uuid string) (errnum in return errnum } +func (logger *FileLoggerImpl) WriteErrMsgRequest(err error, message string, uuid string) (errnum int) { + if err != nil { + logger.Write(uuid + " " + message + ": Error: " + err.Error()) + errnum = 1 + } + return errnum +} + func (logger *FileLoggerImpl) WriteDebug(message string) { if DEBUG { logger.Write(message) @@ -123,3 +131,23 @@ func (logger *FileLoggerImpl) WriteErrRequestDebug(err error, uuid string) (errn } return errnum } + +func (logger *FileLoggerImpl) WriteErrMsgRequestDebug(err error, message string, uuid string) (errnum int) { + if err != nil { + if DEBUG { + logger.WriteErrMsgRequest(err, message, uuid) + } + errnum = 1 + } + return errnum +} + +func (logger *ConsoleLoggerImpl) WriteErrMsgRequestDebug(err error, message string, uuid string) (errnum int) { + if err != nil { + if DEBUG { + logger.WriteErrMsgRequest(err, message, uuid) + } + errnum = 1 + } + return errnum +} diff --git a/logger/interfaces.go b/logger/interfaces.go index 95c5ee1..e5b90f5 100644 --- a/logger/interfaces.go +++ b/logger/interfaces.go @@ -26,6 +26,8 @@ type ( // If an error that is not nill passed in it logs the error and returns 1, otherwise 0 WriteErr(error) int WriteErrRequest(err error, uuid string) int + + WriteErrMsgRequest(err error, message string, uuid string) int } // Use _DEBUG prints to strip them out of release builds DebugLogger interface { @@ -38,6 +40,8 @@ type ( WriteRequestDebug(message string, uuid string) WriteErrDebug(err error) (errnum int) WriteErrRequestDebug(err error, uuid string) int + + WriteErrMsgRequestDebug(err error, message string, uuid string) int } ) diff --git a/logger/nulllogger.go b/logger/nulllogger.go index c55be61..9715318 100644 --- a/logger/nulllogger.go +++ b/logger/nulllogger.go @@ -24,6 +24,13 @@ func (logger *NullLoggerImpl) WriteErrRequest(err error, uuid string) (errnum in return errnum } +func (logger *NullLoggerImpl) WriteErrMsgRequest(err error, message string, uuid string) (errnum int) { + if err != nil { + errnum = 1 + } + return errnum +} + func (logger *NullLoggerImpl) WriteDebug(message string) {} func (logger *NullLoggerImpl) WriteRequestDebug(message string, uuid string) {} @@ -41,3 +48,10 @@ func (logger *NullLoggerImpl) WriteErrRequestDebug(err error, uuid string) (errn } return errnum } + +func (logger *NullLoggerImpl) WriteErrMsgRequestDebug(err error, message string, uuid string) (errnum int) { + if err != nil { + errnum = 1 + } + return errnum +} diff --git a/logger/sloglogger.go b/logger/sloglogger.go index e1ec85d..6ea9c98 100644 --- a/logger/sloglogger.go +++ b/logger/sloglogger.go @@ -32,6 +32,14 @@ func (logger *SlogLoggerImpl) WriteErrRequest(err error, uuid string) (errnum in return errnum } +func (logger *SlogLoggerImpl) WriteErrMsgRequest(err error, message string, uuid string) (errnum int) { + if err != nil { + slog.Error(message+err.Error(), "UUID", uuid) + errnum = 1 + } + return errnum +} + func (logger *SlogLoggerImpl) WriteDebug(message string) { if DEBUG { logger.Write(message) @@ -63,3 +71,13 @@ func (logger *SlogLoggerImpl) WriteErrRequestDebug(err error, uuid string) (errn } return errnum } + +func (logger *SlogLoggerImpl) WriteErrMsgRequestDebug(err error, message string, uuid string) (errnum int) { + if err != nil { + if DEBUG { + logger.WriteErrMsgRequest(err, message, uuid) + } + errnum = 1 + } + return errnum +}