Merge pull request #39 from benabernathy/mobius_38

[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 f18ae9d9c841a9edb70062b9ec96c017f8d8e8ba..2f914c4d1f6a34242dfd180b50ddd67ecb2a1598 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -2,17 +2,26 @@ 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"

+       "io"
+       "log"

        "math/rand"
        "math/rand"

+       "net/http"

        "os"
        "runtime"
        "os"
        "runtime"

+       "strings"

        "time"
 )
 
        "time"
 )
 

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

 const (
        defaultPort = 5500
 )
 const (
        defaultPort = 5500
 )


@@ -23,9 +32,12 @@ func main() {
        ctx, cancelRoot := context.WithCancel(context.Background())
 
        basePort := flag.Int("bind", defaultPort, "Bind address and port")
        ctx, cancelRoot := context.WithCancel(context.Background())
 
        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")
        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")

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

        flag.Parse()
 
        if *version {
        flag.Parse()
 
        if *version {


@@ -44,21 +56,65 @@ func main() {
        defer func() { _ = l.Sync() }()
        logger := l.Sugar()
 
        defer func() { _ = l.Sync() }()
        logger := l.Sugar()
 

+       if !(strings.HasSuffix(*configDir, "/") || strings.HasSuffix(*configDir, "\\")) {
+               *configDir = *configDir + "/"
+       }
+
+       if *init {
+               if _, err := os.Stat(*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) {
                logger.Fatalw("Configuration directory not found", "path", configDir)
        }
 
        if _, err := os.Stat(*configDir); os.IsNotExist(err) {
                logger.Fatalw("Configuration directory not found", "path", configDir)
        }
 

-       hotline.FS = &hotline.OSFileStore{}
-
-       srv, err := hotline.NewServer(*configDir, "", *basePort, logger)
+       srv, err := hotline.NewServer(*configDir, "", *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
        logger.Fatal(srv.ListenAndServe(ctx, cancelRoot))
 }
 
        // Serve Hotline requests until program exit
        logger.Fatal(srv.ListenAndServe(ctx, cancelRoot))
 }
 

+type statHandler struct {
+       hlServer *hotline.Server
+}
+
+func (sh *statHandler) RenderStats(w http.ResponseWriter, _ *http.Request) {
+       u, err := json.Marshal(sh.hlServer.Stats)
+       if err != nil {
+               panic(err)
+       }
+
+       _, _ = io.WriteString(w, string(u))
+}
+

 func newStdoutCore(level zapcore.Level) zapcore.Core {
        encoderCfg := zap.NewProductionEncoderConfig()
        encoderCfg.TimeKey = "timestamp"
 func newStdoutCore(level zapcore.Level) zapcore.Core {
        encoderCfg := zap.NewProductionEncoderConfig()
        encoderCfg.TimeKey = "timestamp"


@@ -81,7 +137,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/"


@@ -96,3 +152,53 @@ func defaultConfigPath() (cfgPath string) {
 
        return cfgPath
 }
 
        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(dst+"/"+dirEntry.Name(), 0777); err != nil {
+                               panic(err)
+                       }
+                       subdirEntries, _ := cfgTemplate.ReadDir(src + "/" + dirEntry.Name())
+                       for _, subDirEntry := range subdirEntries {
+                               f, err := os.Create(dst + "/" + dirEntry.Name() + "/" + subDirEntry.Name())
+                               if err != nil {
+                                       return err
+                               }
+
+                               srcFile, err := cfgTemplate.Open(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(dst + "/" + dirEntry.Name())
+                       if err != nil {
+                               return err
+                       }
+
+                       srcFile, err := cfgTemplate.Open(src + "/" + dirEntry.Name())
+                       if err != nil {
+                               return err
+                       }
+                       _, err = io.Copy(f, srcFile)
+                       if err != nil {
+                               return err
+                       }
+                       f.Close()
+               }
+
+       }
+
+       return nil
+}