patch: v0.5.4

[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..8a3135ebbabd8fbb1ff7f0c3b6c351e35c9c4453 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -2,12 +2,16 @@ package main
 
 import (
        "context"
 
 import (
        "context"

+       "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"
        "time"
        "os"
        "runtime"
        "time"


@@ -23,6 +27,7 @@ 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")


@@ -48,17 +53,41 @@ func main() {
                logger.Fatalw("Configuration directory not found", "path", configDir)
        }
 
                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"