Remove redundant text encoding func

[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 772625b6a19b897d74a1ed95b77f135f5a9239e1..2bda39bf3a1bbfeebd8963bc5b7ab1df43989da3 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -2,26 +2,57 @@ package main
 
 import (
        "context"
 
 import (
        "context"

+       "embed"
+       "encoding/json"

        "flag"
        "fmt"
        "github.com/jhalter/mobius/hotline"
        "go.uber.org/zap"
        "go.uber.org/zap/zapcore"
        "flag"
        "fmt"
        "github.com/jhalter/mobius/hotline"
        "go.uber.org/zap"
        "go.uber.org/zap/zapcore"

+       "gopkg.in/natefinch/lumberjack.v2"
+       "io"
+       "log"
+       "net/http"

        "os"
        "os"

+       "path/filepath"
+       "runtime"

 )
 
 )
 

+//go:embed mobius/config
+var cfgTemplate embed.FS
+

 const (
 const (

-       defaultConfigPath = "/usr/local/var/mobius/config/" // matches Homebrew default config location
-       defaultPort       = 5500
+       defaultPort = 5500

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

-       ctx, cancelRoot := context.WithCancel(context.Background())
+       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():
+       //      }
+       // }()

 
 

-       basePort := flag.Int("bind", defaultPort, "Bind address and port")
-       configDir := flag.String("config", defaultConfigPath, "Path to config root")
+       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")
        logLevel := flag.String("log-level", "info", "Log level")
        version := 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 {
        flag.Parse()
 
        if *version {


@@ -35,22 +66,70 @@ func main() {
                os.Exit(0)
        }
 
                os.Exit(0)
        }
 

-       cores := []zapcore.Core{newStdoutCore(zapLvl)}
+       cores := []zapcore.Core{
+               newStdoutCore(zapLvl),
+       }
+
+       if *logFile != "" {
+               cores = append(cores, newLogFileCore(*logFile, zapLvl))
+       }
+

        l := zap.New(zapcore.NewTee(cores...))
        defer func() { _ = l.Sync() }()
        logger := l.Sugar()
 
        l := zap.New(zapcore.NewTee(cores...))
        defer func() { _ = l.Sync() }()
        logger := l.Sugar()
 

+       if *init {
+               if _, err := os.Stat(filepath.Join(*configDir, "/config.yaml")); os.IsNotExist(err) {
+                       if err := os.MkdirAll(*configDir, 0750); err != nil {
+                               logger.Fatal(err)
+                       }
+
+                       if err := copyDir("mobius/config", *configDir); err != nil {
+                               logger.Fatal(err)
+                       }
+                       logger.Infow("Config dir initialized at " + *configDir)
+               } else {
+                       logger.Infow("Existing config dir found.  Skipping initialization.")
+               }
+       }
+

        if _, err := os.Stat(*configDir); os.IsNotExist(err) {
        if _, err := os.Stat(*configDir); os.IsNotExist(err) {

-               logger.Fatalw("Configuration directory not found", "path", configDir)
+               logger.Fatalw("Configuration directory not found.  Correct the path or re-run with -init to generate initial config.", "path", configDir)

        }
 
        }
 

-       srv, err := hotline.NewServer(*configDir, "", *basePort, logger)
+       srv, err := hotline.NewServer(*configDir, *netInterface, *basePort, logger, &hotline.OSFileStore{})

        if err != nil {
                logger.Fatal(err)
        }
 
        if err != nil {
                logger.Fatal(err)
        }
 

+       sh := statHandler{hlServer: srv}
+       if *statsPort != "" {
+               http.HandleFunc("/", sh.RenderStats)
+
+               go func(srv *hotline.Server) {
+                       // Use the default DefaultServeMux.
+                       err = http.ListenAndServe(":"+*statsPort, nil)
+                       if err != nil {
+                               log.Fatal(err)
+                       }
+               }(srv)
+       }
+

        // Serve Hotline requests until program exit
        // Serve Hotline requests until program exit

-       logger.Fatal(srv.ListenAndServe(ctx, cancelRoot))
+       logger.Fatal(srv.ListenAndServe(ctx, cancel))
+}
+
+type statHandler struct {
+       hlServer *hotline.Server
+}
+
+func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) {
+       u, err := json.Marshal(sh.hlServer.CurrentStats())
+       if err != nil {
+               panic(err)
+       }
+
+       _, _ = io.WriteString(w, string(u))

 }
 
 func newStdoutCore(level zapcore.Level) zapcore.Core {
 }
 
 func newStdoutCore(level zapcore.Level) zapcore.Core {


@@ -65,9 +144,95 @@ func newStdoutCore(level zapcore.Level) zapcore.Core {
        )
 }
 
        )
 }
 

+func newLogFileCore(path string, level zapcore.Level) zapcore.Core {
+       encoderCfg := zap.NewProductionEncoderConfig()
+       encoderCfg.TimeKey = "timestamp"
+       encoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
+       writer := zapcore.AddSync(&lumberjack.Logger{
+               Filename:   path,
+               MaxSize:    100, // MB
+               MaxBackups: 3,
+               MaxAge:     365, // days
+       })
+
+       return zapcore.NewCore(
+               zapcore.NewConsoleEncoder(encoderCfg),
+               writer,
+               level,
+       )
+}
+

 var zapLogLevel = map[string]zapcore.Level{
        "debug": zap.DebugLevel,
        "info":  zap.InfoLevel,
        "warn":  zap.WarnLevel,
        "error": zap.ErrorLevel,
 }
 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":
+               cfgPath = "config/"
+       case "darwin":
+               if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil {
+                       cfgPath = "/usr/local/var/mobius/config/"
+               } else if _, err := os.Stat("/opt/homebrew/var/mobius/config"); err == nil {
+                       cfgPath = "/opt/homebrew/var/mobius/config/"
+               }
+       case "linux":
+               cfgPath = "/usr/local/var/mobius/config/"
+       default:
+               cfgPath = "./config/"
+       }
+
+       return cfgPath
+}
+
+// TODO: Simplify this mess.  Why is it so difficult to recursively copy a directory?
+func copyDir(src, dst string) error {
+       entries, err := cfgTemplate.ReadDir(src)
+       if err != nil {
+               return err
+       }
+       for _, dirEntry := range entries {
+               if dirEntry.IsDir() {
+                       if err := os.MkdirAll(filepath.Join(dst, dirEntry.Name()), 0777); err != nil {
+                               panic(err)
+                       }
+                       subdirEntries, _ := cfgTemplate.ReadDir(filepath.Join(src, dirEntry.Name()))
+                       for _, subDirEntry := range subdirEntries {
+                               f, err := os.Create(filepath.Join(dst, dirEntry.Name(), subDirEntry.Name()))
+                               if err != nil {
+                                       return err
+                               }
+
+                               srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name(), subDirEntry.Name()))
+                               if err != nil {
+                                       return err
+                               }
+                               _, err = io.Copy(f, srcFile)
+                               if err != nil {
+                                       return err
+                               }
+                               f.Close()
+                       }
+               } else {
+                       f, err := os.Create(filepath.Join(dst, dirEntry.Name()))
+                       if err != nil {
+                               return err
+                       }
+
+                       srcFile, err := cfgTemplate.Open(filepath.Join(src, dirEntry.Name()))
+                       if err != nil {
+                               return err
+                       }
+                       _, err = io.Copy(f, srcFile)
+                       if err != nil {
+                               return err
+                       }
+                       f.Close()
+               }
+       }
+
+       return nil
+}