X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/fd01ba0e7e10dc67ac12afb55e91d909727cfcbf..95159e5585762c06c654945070ba54262b7dcec9:/cmd/mobius-hotline-server/main.go diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go index 2f914c4..8e66938 100644 --- a/cmd/mobius-hotline-server/main.go +++ b/cmd/mobius-hotline-server/main.go @@ -7,82 +7,106 @@ import ( "flag" "fmt" "github.com/jhalter/mobius/hotline" - "go.uber.org/zap" - "go.uber.org/zap/zapcore" + "gopkg.in/natefinch/lumberjack.v2" "io" "log" - "math/rand" + "log/slog" "net/http" "os" + "path/filepath" "runtime" - "strings" - "time" ) //go:embed mobius/config var cfgTemplate embed.FS -const ( - defaultPort = 5500 -) +const defaultPort = 5500 -func main() { - rand.Seed(time.Now().UnixNano()) +var logLevels = map[string]slog.Level{ + "debug": slog.LevelDebug, + "info": slog.LevelInfo, + "error": slog.LevelError, +} - ctx, cancelRoot := context.WithCancel(context.Background()) +var ( + version = "dev" + commit = "none" + date = "unknown" +) - basePort := flag.Int("bind", defaultPort, "Bind address and port") +func main() { + ctx, cancel := context.WithCancel(context.Background()) + + // TODO: implement graceful shutdown by closing context + // c := make(chan os.Signal, 1) + // signal.Notify(c, os.Interrupt) + // defer func() { + // signal.Stop(c) + // cancel() + // }() + // go func() { + // select { + // case <-c: + // cancel() + // case <-ctx.Done(): + // } + // }() + + netInterface := flag.String("interface", "", "IP addr of interface to listen on. Defaults to all interfaces.") + basePort := flag.Int("bind", defaultPort, "Base Hotline server port. File transfer port is base port + 1.") statsPort := flag.String("stats-port", "", "Enable stats HTTP endpoint on address and port") configDir := flag.String("config", defaultConfigPath(), "Path to config root") - version := flag.Bool("version", false, "print version and exit") + printVersion := flag.Bool("version", false, "print version and exit") logLevel := flag.String("log-level", "info", "Log level") + logFile := flag.String("log-file", "", "Path to log file") + init := flag.Bool("init", false, "Populate the config dir with default configuration") flag.Parse() - if *version { - fmt.Printf("v%s\n", hotline.VERSION) + if *printVersion { + fmt.Printf("mobius-hotline-server %s, commit %s, built at %s", version, commit, date) os.Exit(0) } - zapLvl, ok := zapLogLevel[*logLevel] - if !ok { - fmt.Printf("Invalid log level %s. Must be debug, info, warn, or error.\n", *logLevel) - os.Exit(0) - } - - cores := []zapcore.Core{newStdoutCore(zapLvl)} - l := zap.New(zapcore.NewTee(cores...)) - defer func() { _ = l.Sync() }() - logger := l.Sugar() - - if !(strings.HasSuffix(*configDir, "/") || strings.HasSuffix(*configDir, "\\")) { - *configDir = *configDir + "/" - } + 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]}, + ), + ) if *init { - if _, err := os.Stat(*configDir + "/config.yaml"); os.IsNotExist(err) { + if _, err := os.Stat(filepath.Join(*configDir, "/config.yaml")); os.IsNotExist(err) { if err := os.MkdirAll(*configDir, 0750); err != nil { - logger.Fatal(err) + slogger.Error(fmt.Sprintf("error creating config dir: %s", err)) + os.Exit(1) } if err := copyDir("mobius/config", *configDir); err != nil { - logger.Fatal(err) + slogger.Error(fmt.Sprintf("error copying config dir: %s", err)) + os.Exit(1) } - logger.Infow("Config dir initialized at " + *configDir) - + slogger.Info("Config dir initialized at " + *configDir) } else { - logger.Infow("Existing config dir found. Skipping initialization.") + slogger.Info("Existing config dir found. Skipping initialization.") } } if _, err := os.Stat(*configDir); os.IsNotExist(err) { - logger.Fatalw("Configuration directory not found", "path", configDir) + slogger.Error(fmt.Sprintf("Configuration directory not found. Correct the path or re-run with -init to generate initial config.")) + os.Exit(1) } - srv, err := hotline.NewServer(*configDir, "", *basePort, logger, &hotline.OSFileStore{}) + srv, err := hotline.NewServer(*configDir, *netInterface, *basePort, slogger, &hotline.OSFileStore{}) if err != nil { - logger.Fatal(err) + slogger.Error(fmt.Sprintf("Error starting server: %s", err)) + os.Exit(1) } sh := statHandler{hlServer: srv} @@ -99,7 +123,7 @@ func main() { } // Serve Hotline requests until program exit - logger.Fatal(srv.ListenAndServe(ctx, cancelRoot)) + log.Fatal(srv.ListenAndServe(ctx, cancel)) } type statHandler struct { @@ -107,7 +131,7 @@ type statHandler struct { } func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) { - u, err := json.Marshal(sh.hlServer.Stats) + u, err := json.Marshal(sh.hlServer.CurrentStats()) if err != nil { panic(err) } @@ -115,25 +139,6 @@ func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) { _, _ = io.WriteString(w, string(u)) } -func newStdoutCore(level zapcore.Level) zapcore.Core { - encoderCfg := zap.NewProductionEncoderConfig() - encoderCfg.TimeKey = "timestamp" - encoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder - - return zapcore.NewCore( - zapcore.NewConsoleEncoder(encoderCfg), - zapcore.Lock(os.Stdout), - level, - ) -} - -var zapLogLevel = map[string]zapcore.Level{ - "debug": zap.DebugLevel, - "info": zap.InfoLevel, - "warn": zap.WarnLevel, - "error": zap.ErrorLevel, -} - func defaultConfigPath() (cfgPath string) { switch runtime.GOOS { case "windows": @@ -147,7 +152,7 @@ func defaultConfigPath() (cfgPath string) { case "linux": cfgPath = "/usr/local/var/mobius/config/" default: - fmt.Printf("unsupported OS") + cfgPath = "./config/" } return cfgPath @@ -161,17 +166,17 @@ func copyDir(src, dst string) error { } for _, dirEntry := range entries { if dirEntry.IsDir() { - if err := os.MkdirAll(dst+"/"+dirEntry.Name(), 0777); err != nil { + if err := os.MkdirAll(filepath.Join(dst, dirEntry.Name()), 0777); err != nil { panic(err) } - subdirEntries, _ := cfgTemplate.ReadDir(src + "/" + dirEntry.Name()) + subdirEntries, _ := cfgTemplate.ReadDir(filepath.Join(src, dirEntry.Name())) for _, subDirEntry := range subdirEntries { - f, err := os.Create(dst + "/" + dirEntry.Name() + "/" + subDirEntry.Name()) + f, err := os.Create(filepath.Join(dst, dirEntry.Name(), subDirEntry.Name())) if err != nil { return err } - srcFile, err := cfgTemplate.Open(src + "/" + dirEntry.Name() + "/" + subDirEntry.Name()) + srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name(), subDirEntry.Name())) if err != nil { return err } @@ -182,12 +187,12 @@ func copyDir(src, dst string) error { f.Close() } } else { - f, err := os.Create(dst + "/" + dirEntry.Name()) + f, err := os.Create(filepath.Join(dst, dirEntry.Name())) if err != nil { return err } - srcFile, err := cfgTemplate.Open(src + "/" + dirEntry.Name()) + srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name())) if err != nil { return err } @@ -197,7 +202,6 @@ func copyDir(src, dst string) error { } f.Close() } - } return nil