aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorJeff Halter <868228+jhalter@users.noreply.github.com>2024-07-21 12:47:18 -0700
committerJeff Halter <868228+jhalter@users.noreply.github.com>2024-07-21 12:47:18 -0700
commitadcd4879d93e6d298ff2644178bc47c1eb8d1da4 (patch)
tree782399a609d8e09163c0e2f2fb3a3e916c75dd9c /cmd
parentdcd23d5355badf66c34ffd63d3c44734e87ebf17 (diff)
Clean up logging
Diffstat (limited to 'cmd')
-rw-r--r--cmd/mobius-hotline-server/main.go29
1 files changed, 3 insertions, 26 deletions
diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
index 33ba7c2..6b82764 100644
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -7,10 +7,8 @@ import (
"fmt"
"github.com/jhalter/mobius/hotline"
"github.com/jhalter/mobius/internal/mobius"
- "gopkg.in/natefinch/lumberjack.v2"
"io"
"log"
- "log/slog"
"os"
"os/signal"
"path"
@@ -21,12 +19,6 @@ import (
//go:embed mobius/config
var cfgTemplate embed.FS
-var logLevels = map[string]slog.Level{
- "debug": slog.LevelDebug,
- "info": slog.LevelInfo,
- "error": slog.LevelError,
-}
-
// Values swapped in by go-releaser at build time
var (
version = "dev"
@@ -52,21 +44,11 @@ func main() {
flag.Parse()
if *printVersion {
- fmt.Printf("mobius-hotline-server %s, commit %s, built at %s", version, commit, date)
+ fmt.Printf("mobius-hotline-server %s, commit %s, built on %s\n", version, commit, date)
os.Exit(0)
}
- slogger := slog.New(
- slog.NewTextHandler(
- io.MultiWriter(os.Stdout, &lumberjack.Logger{
- Filename: *logFile,
- MaxSize: 100, // MB
- MaxBackups: 3,
- MaxAge: 365, // days
- }),
- &slog.HandlerOptions{Level: logLevels[*logLevel]},
- ),
- )
+ slogger := mobius.NewLogger(logLevel, logFile)
// It's important for Windows compatibility to use path.Join and not filepath.Join for the config dir initialization.
// https://github.com/golang/go/issues/44305
@@ -181,12 +163,7 @@ func main() {
}
}()
- slogger.Info("Hotline server started",
- "version", version,
- "config", *configDir,
- "API port", fmt.Sprintf("%s:%v", *netInterface, *basePort),
- "Transfer port", fmt.Sprintf("%s:%v", *netInterface, *basePort+1),
- )
+ slogger.Info("Hotline server started", "version", version, "config", *configDir)
// Assign functions to handle specific Hotline transaction types
mobius.RegisterHandlers(srv)