diff --git a/internal/logging/logging.go b/internal/logging/logging.go index d22af85..52302fe 100644 --- a/internal/logging/logging.go +++ b/internal/logging/logging.go @@ -13,10 +13,10 @@ type Logger struct { } var ( - logger Logger + Log Logger ) -func InitLogger(appConfig *config.AppConfig) Logger { +func Init(appConfig *config.AppConfig) { lj := &lumberjack.Logger{ Filename: filepath.Join(appConfig.LogDir, appConfig.LogFile), @@ -26,17 +26,11 @@ func InitLogger(appConfig *config.AppConfig) Logger { Compress: appConfig.LogCompression, } - logger = Logger{ + Log = Logger{ slog.New( slog.NewJSONHandler(lj, &slog.HandlerOptions{ AddSource: appConfig.LogAddSource, }), ), } - - return logger -} - -func GetLogger() Logger { - return logger } diff --git a/main.go b/main.go index 3ece662..f7ee39e 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,6 @@ var ( Guild = flag.String("guild", "", "Guild ID") // Do we want it to be tied to one server? appConfig *config.AppConfig - Log logging.Logger ) func main() { @@ -35,7 +34,7 @@ func main() { log.Fatal(err) } - Log = logging.InitLogger(appConfig) + logging.Init(appConfig) err = startBot() @@ -49,21 +48,21 @@ func startBot() error { err := state.DiscordSession.Open() if err != nil { - Log.Error("could not open discord session", "type", "error", "error", err) + logging.Log.Error("could not open discord session", "type", "error", "error", err) return err } - Log.Info("shutting down gracefully", "type", "shutdown") + logging.Log.Info("shutting down gracefully", "type", "shutdown") sigch := make(chan os.Signal, 1) signal.Notify(sigch, os.Interrupt) <-sigch - Log.Info("shutting down gracefully", "type", "shutdown") + logging.Log.Info("shutting down gracefully", "type", "shutdown") err = state.DiscordSession.Close() if err != nil { - Log.Error("could not close discord session gracefully", "type", "error", "error", err) + logging.Log.Error("could not close discord session gracefully", "type", "error", "error", err) return err }