Account for the root

[rbdr/mobius] / cmd / mobius-hotline-server / main.go

diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
index 33ba7c2125155d511b507d1a34aa86674310db79..e4e095447e670bf2cc00fca14e6add54e53d1474 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -7,10 +7,9 @@ import (
        "fmt"
        "github.com/jhalter/mobius/hotline"
        "github.com/jhalter/mobius/internal/mobius"
        "fmt"
        "github.com/jhalter/mobius/hotline"
        "github.com/jhalter/mobius/internal/mobius"

-       "gopkg.in/natefinch/lumberjack.v2"
+       "github.com/oleksandr/bonjour"

        "io"
        "log"
        "io"
        "log"

-       "log/slog"

        "os"
        "os/signal"
        "path"
        "os"
        "os/signal"
        "path"


@@ -21,17 +20,10 @@ import (
 //go:embed mobius/config
 var cfgTemplate embed.FS
 
 //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"
        commit  = "none"
 // Values swapped in by go-releaser at build time
 var (
        version = "dev"
        commit  = "none"

-       date    = "unknown"

 )
 
 func main() {
 )
 
 func main() {


@@ -52,21 +44,11 @@ func main() {
        flag.Parse()
 
        if *printVersion {
        flag.Parse()
 
        if *printVersion {

-               fmt.Printf("mobius-hotline-server %s, commit %s, built at %s", version, commit, date)
+               fmt.Printf("mobius-hotline-server version %s, commit %s\n", version, commit)

                os.Exit(0)
        }
 
                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
 
        // 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,16 +163,19 @@ 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)
 
 
        // Assign functions to handle specific Hotline transaction types
        mobius.RegisterHandlers(srv)
 

+       if srv.Config.EnableBonjour {
+               s, err := bonjour.Register(srv.Config.Name, "_hotline._tcp", "", *basePort, []string{"txtv=1", "app=hotline"}, nil)
+               if err != nil {
+                       slogger.Error("Error registering Hotline server with Bonjour", "err", err)
+               }
+               defer s.Shutdown()
+       }
+

        // Serve Hotline requests until program exit
        log.Fatal(srv.ListenAndServe(ctx))
 }
        // Serve Hotline requests until program exit
        log.Fatal(srv.ListenAndServe(ctx))
 }