Add basic stat counters

[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 2f914c4d1f6a34242dfd180b50ddd67ecb2a1598..8407449ab826a3dfc0e0fe051b3c37249b81d2b6 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -14,8 +14,8 @@ import (
        "math/rand"
        "net/http"
        "os"
+       "path/filepath"
        "runtime"
-       "strings"
        "time"
 )
 
@@ -29,7 +29,22 @@ const (
 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")
@@ -56,12 +71,8 @@ func main() {
        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.Stat(filepath.Join(*configDir, "/config.yaml")); os.IsNotExist(err) {
                        if err := os.MkdirAll(*configDir, 0750); err != nil {
                                logger.Fatal(err)
                        }
@@ -77,10 +88,10 @@ func main() {
        }
 
        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)
        }
@@ -99,7 +110,7 @@ func main() {
        }
 
        // Serve Hotline requests until program exit
-       logger.Fatal(srv.ListenAndServe(ctx, cancelRoot))
+       logger.Fatal(srv.ListenAndServe(ctx, cancel))
 }
 
 type statHandler struct {
@@ -107,7 +118,7 @@ type statHandler struct {
 }
 
 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)
        }
@@ -161,17 +172,17 @@ func copyDir(src, dst string) error {
        }
        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)
                        }
-                       subdirEntries, _ := cfgTemplate.ReadDir(src + "/" + dirEntry.Name())
+                       subdirEntries, _ := cfgTemplate.ReadDir(filepath.Join(src, dirEntry.Name()))
                        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
                                }
 
-                               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
                                }
@@ -182,12 +193,12 @@ func copyDir(src, dst string) error {
                                f.Close()
                        }
                } else {
-                       f, err := os.Create(dst + "/" + dirEntry.Name())
+                       f, err := os.Create(filepath.Join(dst, dirEntry.Name()))
                        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
                        }