build(deps): bump golang.org/x/crypto (#110)

[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 07bbc88f5fe982feb4bcd7aabd47f41f79f6eb59..c5eea27749661b9c457ad2a49f7e084b47bee7b3 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -9,13 +9,13 @@ import (
        "github.com/jhalter/mobius/hotline"
        "go.uber.org/zap"
        "go.uber.org/zap/zapcore"
        "github.com/jhalter/mobius/hotline"
        "go.uber.org/zap"
        "go.uber.org/zap/zapcore"

+       "gopkg.in/natefinch/lumberjack.v2"

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

-       "math/rand"

        "net/http"
        "os"
        "net/http"
        "os"

+       "path/filepath"

        "runtime"
        "runtime"

-       "time"

 )
 
 //go:embed mobius/config
 )
 
 //go:embed mobius/config


@@ -26,15 +26,30 @@ const (
 )
 
 func main() {
 )
 
 func main() {

-       rand.Seed(time.Now().UnixNano())
-
-       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")
        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")
 
        basePort := flag.Int("bind", defaultPort, "Bind address and port")
        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")

+       logFile := flag.String("log-file", "", "Path to log file")
+

        init := flag.Bool("init", false, "Populate the config dir with default configuration")
 
        flag.Parse()
        init := flag.Bool("init", false, "Populate the config dir with default configuration")
 
        flag.Parse()


@@ -50,13 +65,20 @@ 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()
 
        if *init {
        l := zap.New(zapcore.NewTee(cores...))
        defer func() { _ = l.Sync() }()
        logger := l.Sugar()
 
        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)
                        }
                        if err := os.MkdirAll(*configDir, 0750); err != nil {
                                logger.Fatal(err)
                        }


@@ -65,17 +87,16 @@ func main() {
                                logger.Fatal(err)
                        }
                        logger.Infow("Config dir initialized at " + *configDir)
                                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) {
                } else {
                        logger.Infow("Existing config dir found.  Skipping initialization.")
                }
        }
 
        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, &hotline.OSFileStore{})
+       srv, err := hotline.NewServer(*configDir, *basePort, logger, &hotline.OSFileStore{})

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


@@ -94,7 +115,7 @@ func main() {
        }
 
        // 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 {
 }
 
 type statHandler struct {


@@ -102,7 +123,7 @@ type statHandler struct {
 }
 
 func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) {
 }
 
 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)
        }
        if err != nil {
                panic(err)
        }


@@ -122,6 +143,24 @@ 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,
 var zapLogLevel = map[string]zapcore.Level{
        "debug": zap.DebugLevel,
        "info":  zap.InfoLevel,


@@ -132,7 +171,7 @@ var zapLogLevel = map[string]zapcore.Level{
 func defaultConfigPath() (cfgPath string) {
        switch runtime.GOOS {
        case "windows":
 func defaultConfigPath() (cfgPath string) {
        switch runtime.GOOS {
        case "windows":

-               cfgPath = "config"
+               cfgPath = "config/"

        case "darwin":
                if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil {
                        cfgPath = "/usr/local/var/mobius/config/"
        case "darwin":
                if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil {
                        cfgPath = "/usr/local/var/mobius/config/"


@@ -156,17 +195,17 @@ func copyDir(src, dst string) error {
        }
        for _, dirEntry := range entries {
                if dirEntry.IsDir() {
        }
        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)
                        }
                                panic(err)
                        }

-                       subdirEntries, _ := cfgTemplate.ReadDir(src + "/" + dirEntry.Name())
+                       subdirEntries, _ := cfgTemplate.ReadDir(filepath.Join(src, dirEntry.Name()))

                        for _, subDirEntry := range subdirEntries {
                        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
                                }
 
                                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
                                }
                                if err != nil {
                                        return err
                                }


@@ -177,12 +216,12 @@ func copyDir(src, dst string) error {
                                f.Close()
                        }
                } else {
                                f.Close()
                        }
                } else {

-                       f, err := os.Create(dst + "/" + dirEntry.Name())
+                       f, err := os.Create(filepath.Join(dst, dirEntry.Name()))

                        if err != nil {
                                return err
                        }
 
                        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
                        }
                        if err != nil {
                                return err
                        }


@@ -192,7 +231,6 @@ func copyDir(src, dst string) error {
                        }
                        f.Close()
                }
                        }
                        f.Close()
                }

-

        }
 
        return nil
        }
 
        return nil