Refactor filestore to simplify testing

[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..60327a803e8b2cfd27140012b5995ed4530aa387 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -7,19 +7,23 @@ 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"

+       "math/rand"

        "os"
        "os"

+       "runtime"
+       "time"

 )
 
 const (
 )
 
 const (

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

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

+       rand.Seed(time.Now().UnixNano())
+

        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")

-       configDir := flag.String("config", defaultConfigPath, "Path to config root")
+       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")
        flag.Parse()
        version := flag.Bool("version", false, "print version and exit")
        logLevel := flag.String("log-level", "info", "Log level")
        flag.Parse()


@@ -44,7 +48,7 @@ func main() {
                logger.Fatalw("Configuration directory not found", "path", configDir)
        }
 
                logger.Fatalw("Configuration directory not found", "path", configDir)
        }
 

-       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)
        }


@@ -71,3 +75,22 @@ var zapLogLevel = map[string]zapcore.Level{
        "warn":  zap.WarnLevel,
        "error": zap.ErrorLevel,
 }
        "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:
+               fmt.Printf("unsupported OS")
+       }
+
+       return cfgPath
+}