move around

go.sum

@@ -0,0 +1,4 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

server/cmd/config.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	yaml "gopkg.in/yaml.v3"
+)
+
+const (
+	defaultPort         = 7099
+	defaultInstanceName = "BBJ"
+	defaultHost         = "127.0.0.1"
+)
+
+type Config struct {
+	Admins       []string
+	Port         int
+	Host         string
+	InstanceName string `yaml:"instance_name"`
+	AllowAnon    bool   `yaml:"allow_anon"`
+	Debug        bool
+}
+
+func parseConfig(configPath string) (*Config, error) {
+	cfgBytes, err := os.ReadFile(configPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read config file: %w", err)
+	}
+
+	var cfg Config
+
+	if err := yaml.Unmarshal(cfgBytes, &cfg); err != nil {
+		return nil, fmt.Errorf("failed to parse config: %w", err)
+	}
+
+	if cfg.Port == 0 {
+		cfg.Port = defaultPort
+	}
+
+	if cfg.InstanceName == "" {
+		cfg.InstanceName = defaultInstanceName
+
+	}
+
+	if cfg.Host == "" {
+		cfg.Host = defaultHost
+	}
+
+	return &cfg, nil
+}

server/cmd/main.go

@@ -5,25 +5,8 @@ import (
 	"fmt"
 	"io"
 	"os"
-
-	yaml "gopkg.in/yaml.v3"
 )
 
-const (
-	defaultPort         = 7099
-	defaultInstanceName = "BBJ"
-	defaultHost         = "127.0.0.1"
-)
-
-type Config struct {
-	Admins       []string
-	Port         int
-	Host         string
-	InstanceName string `yaml:"instance_name"`
-	AllowAnon    bool
-	Debug        bool
-}
-
 type iostreams struct {
 	Err io.Writer
 	Out io.Writer
@@ -62,35 +45,3 @@ func _main(opts Opts) error {
 
 	return nil
 }
-
-func parseConfig(configPath string) (*Config, error) {
-	cfgBytes, err := os.ReadFile(configPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read config file: %w", err)
-	}
-
-	fmt.Printf("DBG %#v\n", string(cfgBytes))
-
-	var cfg Config
-
-	if err := yaml.Unmarshal(cfgBytes, &cfg); err != nil {
-		return nil, fmt.Errorf("failed to parse config: %w", err)
-	}
-
-	fmt.Printf("DBG %#v\n", cfg)
-
-	if cfg.Port == 0 {
-		cfg.Port = defaultPort
-	}
-
-	if cfg.InstanceName == "" {
-		cfg.InstanceName = defaultInstanceName
-
-	}
-
-	if cfg.Host == "" {
-		cfg.Host = defaultHost
-	}
-
-	return &cfg, nil
-}