From 1cd47475c3f08ae49825a73282c774f8e054334a Mon Sep 17 00:00:00 2001 From: David Delassus Date: Sat, 24 Aug 2024 16:02:54 +0200 Subject: [PATCH] :truck: move badger specific logger interface to `logging` package --- internal/logging/badger.go | 26 ++++++++++++++++++++++++++ internal/logstorage/logger.go | 24 ------------------------ internal/logstorage/main.go | 4 +++- 3 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 internal/logging/badger.go delete mode 100644 internal/logstorage/logger.go diff --git a/internal/logging/badger.go b/internal/logging/badger.go new file mode 100644 index 00000000..b3a0cd5c --- /dev/null +++ b/internal/logging/badger.go @@ -0,0 +1,26 @@ +package logging + +import ( + "fmt" + "log/slog" +) + +type BadgerLogger struct { + Channel string +} + +func (l *BadgerLogger) Errorf(format string, v ...interface{}) { + slog.Error(fmt.Sprintf(format, v...), "channel", l.Channel) +} + +func (l *BadgerLogger) Warningf(format string, v ...interface{}) { + slog.Warn(fmt.Sprintf(format, v...), "channel", l.Channel) +} + +func (l *BadgerLogger) Infof(format string, v ...interface{}) { + slog.Info(fmt.Sprintf(format, v...), "channel", l.Channel) +} + +func (l *BadgerLogger) Debugf(format string, v ...interface{}) { + slog.Debug(fmt.Sprintf(format, v...), "channel", l.Channel) +} diff --git a/internal/logstorage/logger.go b/internal/logstorage/logger.go deleted file mode 100644 index 162198e4..00000000 --- a/internal/logstorage/logger.go +++ /dev/null @@ -1,24 +0,0 @@ -package logstorage - -import ( - "fmt" - "log/slog" -) - -type serverLogger struct{} - -func (l *serverLogger) Errorf(format string, v ...interface{}) { - slog.Error(fmt.Sprintf(format, v...), "channel", "badger") -} - -func (l *serverLogger) Warningf(format string, v ...interface{}) { - slog.Warn(fmt.Sprintf(format, v...), "channel", "badger") -} - -func (l *serverLogger) Infof(format string, v ...interface{}) { - slog.Info(fmt.Sprintf(format, v...), "channel", "badger") -} - -func (l *serverLogger) Debugf(format string, v ...interface{}) { - slog.Debug(fmt.Sprintf(format, v...), "channel", "badger") -} diff --git a/internal/logstorage/main.go b/internal/logstorage/main.go index 051e9e8b..9af39721 100644 --- a/internal/logstorage/main.go +++ b/internal/logstorage/main.go @@ -13,6 +13,8 @@ import ( "github.com/dgraph-io/badger/v3" "github.com/dgraph-io/badger/v3/options" + + "link-society.com/flowg/internal/logging" ) type Storage struct { @@ -22,7 +24,7 @@ type Storage struct { func NewStorage(dbPath string) (*Storage, error) { opts := badger. DefaultOptions(dbPath). - WithLogger(&serverLogger{}). + WithLogger(&logging.BadgerLogger{Channel: "logstorage"}). WithCompression(options.ZSTD) db, err := badger.Open(opts)