X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/c789e2f35ea97fe2b390cf06dc1c914b913b7535..4d7abe62a6dd692b71090819de0d57a40486bdb2:/cmd/mobius-hotline-server/main.go

diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
index 8407449..1e9b5b6 100644
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -7,93 +7,108 @@ 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"
+	"path"
 	"runtime"
-	"time"
 )
 
 //go:embed mobius/config
 var cfgTemplate embed.FS
 
-const (
-	defaultPort = 5500
+const defaultPort = 5500
+
+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"
+	date    = "unknown"
 )
 
 func main() {
-	rand.Seed(time.Now().UnixNano())
-
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, _ := 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():
-	// 	}
-	// }()
-
-	basePort := flag.Int("bind", defaultPort, "Bind address and port")
+	//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)
-		os.Exit(0)
-	}
-
-	zapLvl, ok := zapLogLevel[*logLevel]
-	if !ok {
-		fmt.Printf("Invalid log level %s.  Must be debug, info, warn, or error.\n", *logLevel)
+	if *printVersion {
+		fmt.Printf("mobius-hotline-server %s, commit %s, built at %s", version, commit, date)
 		os.Exit(0)
 	}
 
-	cores := []zapcore.Core{newStdoutCore(zapLvl)}
-	l := zap.New(zapcore.NewTee(cores...))
-	defer func() { _ = l.Sync() }()
-	logger := l.Sugar()
+	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]},
+		),
+	)
 
+	// 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
 	if *init {
-		if _, err := os.Stat(filepath.Join(*configDir, "/config.yaml")); os.IsNotExist(err) {
+		if _, err := os.Stat(path.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)
+			if err := copyDir(path.Join("mobius", "config"), *configDir); err != nil {
+				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.  Correct the path or re-run with -init to generate initial config.", "path", configDir)
+		slogger.Error("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}
@@ -109,8 +124,14 @@ func main() {
 		}(srv)
 	}
 
+	slogger.Info("Hotline server started",
+		"version", version,
+		"API port", fmt.Sprintf("%s:%v", *netInterface, *basePort),
+		"Transfer port", fmt.Sprintf("%s:%v", *netInterface, *basePort+1),
+	)
+
 	// Serve Hotline requests until program exit
-	logger.Fatal(srv.ListenAndServe(ctx, cancel))
+	log.Fatal(srv.ListenAndServe(ctx))
 }
 
 type statHandler struct {
@@ -126,26 +147,9 @@ 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() string {
+	var cfgPath string
 
-func defaultConfigPath() (cfgPath string) {
 	switch runtime.GOOS {
 	case "windows":
 		cfgPath = "config/"
@@ -158,13 +162,31 @@ func defaultConfigPath() (cfgPath string) {
 	case "linux":
 		cfgPath = "/usr/local/var/mobius/config/"
 	default:
-		fmt.Printf("unsupported OS")
+		cfgPath = "./config/"
 	}
 
 	return cfgPath
 }
 
-// TODO: Simplify this mess.  Why is it so difficult to recursively copy a directory?
+// copyFile copies a file from src to dst. If dst does not exist, it is created.
+func copyFile(src, dst string) error {
+	sourceFile, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer sourceFile.Close()
+
+	destinationFile, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer destinationFile.Close()
+
+	_, err = io.Copy(destinationFile, sourceFile)
+	return err
+}
+
+// copyDir recursively copies a directory tree, attempting to preserve permissions.
 func copyDir(src, dst string) error {
 	entries, err := cfgTemplate.ReadDir(src)
 	if err != nil {
@@ -172,19 +194,19 @@ func copyDir(src, dst string) error {
 	}
 	for _, dirEntry := range entries {
 		if dirEntry.IsDir() {
-			if err := os.MkdirAll(filepath.Join(dst, dirEntry.Name()), 0777); err != nil {
+			if err := os.MkdirAll(path.Join(dst, dirEntry.Name()), 0777); err != nil {
 				panic(err)
 			}
-			subdirEntries, _ := cfgTemplate.ReadDir(filepath.Join(src, dirEntry.Name()))
+			subdirEntries, _ := cfgTemplate.ReadDir(path.Join(src, dirEntry.Name()))
 			for _, subDirEntry := range subdirEntries {
-				f, err := os.Create(filepath.Join(dst, dirEntry.Name(), subDirEntry.Name()))
+				f, err := os.Create(path.Join(dst, dirEntry.Name(), subDirEntry.Name()))
 				if err != nil {
 					return err
 				}
 
-				srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name(), subDirEntry.Name()))
+				srcFile, err := cfgTemplate.Open(path.Join(src, dirEntry.Name(), subDirEntry.Name()))
 				if err != nil {
-					return err
+					return fmt.Errorf("error copying srcFile: %w", err)
 				}
 				_, err = io.Copy(f, srcFile)
 				if err != nil {
@@ -193,12 +215,12 @@ func copyDir(src, dst string) error {
 				f.Close()
 			}
 		} else {
-			f, err := os.Create(filepath.Join(dst, dirEntry.Name()))
+			f, err := os.Create(path.Join(dst, dirEntry.Name()))
 			if err != nil {
 				return err
 			}
 
-			srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name()))
+			srcFile, err := cfgTemplate.Open(path.Join(src, dirEntry.Name()))
 			if err != nil {
 				return err
 			}
@@ -208,7 +230,6 @@ func copyDir(src, dst string) error {
 			}
 			f.Close()
 		}
-
 	}
 
 	return nil