[refactoring] Cleanup config code, make config file optional

Author: g3force

internal/app/controller/config.go

@@ -1,56 +1,88 @@
 package controller
 
 import (
+	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
-	"log"
 	"os"
 	"time"
 )
 
-type RefBoxConfigSpecial struct {
+// special configs that are different between normal and overtime halves
+type ConfigSpecial struct {
 	HalfDuration     time.Duration `yaml:"half-duration"`
 	HalfTimeDuration time.Duration `yaml:"half-time-duration"`
 	TimeoutDuration  time.Duration `yaml:"timeout-duration"`
 	Timeouts         int           `yaml:"timeouts"`
 	BreakAfter       time.Duration `yaml:"break-after"`
 }
 
-type RefBoxConfigGlobal struct {
+// global configs
+type ConfigGlobal struct {
 	YellowCardDuration time.Duration `yaml:"yellow-card-duration"`
 }
 
-type RefBoxConfigPublish struct {
+// publish configs
+type ConfigPublish struct {
 	Address string `yaml:"address"`
 }
 
-type RefBoxConfig struct {
-	Publish  RefBoxConfigPublish `yaml:"publish"`
-	Global   RefBoxConfigGlobal  `yaml:"global"`
-	Normal   RefBoxConfigSpecial `yaml:"normal"`
-	Overtime RefBoxConfigSpecial `yaml:"overtime"`
+// Config structure for the game controller
+type Config struct {
+	Publish  ConfigPublish `yaml:"publish"`
+	Global   ConfigGlobal  `yaml:"global"`
+	Normal   ConfigSpecial `yaml:"normal"`
+	Overtime ConfigSpecial `yaml:"overtime"`
 }
 
-func LoadRefBoxConfig(fileName string) RefBoxConfig {
+// Load a config from given file
+func LoadConfig(fileName string) (config Config, err error) {
+
+	config = DefaultConfig()
 
 	f, err := os.OpenFile(fileName, os.O_RDONLY, 0600)
 	if err != nil {
-		log.Fatal("Can not open config files ", err)
+		err = errors.Errorf("Can not open config file %v. %v", fileName, err)
+		return
+	}
+
+	b, err := readAll(f)
+
+	err = yaml.Unmarshal(b, &config)
+	if err != nil {
+		err = errors.Errorf("Could not unmarshal config file %v. %v", fileName, err)
 	}
 
+	return
+}
+
+// Create a config with default values
+func DefaultConfig() (c Config) {
+	c.Publish.Address = "224.5.23.1:10003"
+	c.Global.YellowCardDuration = 2 * time.Minute
+
+	c.Normal.HalfDuration = 5 * time.Minute
+	c.Normal.HalfTimeDuration = 5 * time.Minute
+	c.Normal.Timeouts = 4
+	c.Normal.TimeoutDuration = 5 * time.Minute
+	c.Normal.BreakAfter = 5 * time.Minute
+
+	c.Overtime.HalfDuration = 2*time.Minute + 30*time.Second
+	c.Overtime.HalfTimeDuration = 2 * time.Minute
+	c.Overtime.Timeouts = 2
+	c.Overtime.TimeoutDuration = 5 * time.Minute
+	c.Overtime.BreakAfter = 2 * time.Minute
+
+	return
+}
+
+func readAll(f *os.File) ([]byte, error) {
 	b := make([]byte, 10000)
 	n, err := f.Read(b)
 	if err != nil {
-		log.Fatal("Can not read config files ", err)
+		return []byte{}, errors.Errorf("Can not read config files: %v", err)
 	}
 	if n == len(b) {
-		log.Fatal("Buffer size for reading config file is too small")
+		return []byte{}, errors.New("Buffer size for reading config file is too small")
 	}
-
-	config := RefBoxConfig{}
-	err = yaml.Unmarshal(b[:n], &config)
-	if err != nil {
-		log.Fatal("Could not unmarshal config file ", err)
-	}
-
-	return config
+	return b[:n], nil
 }

internal/app/controller/refBox.go

@@ -21,25 +21,34 @@ type RefBox struct {
 	MatchTimeStart    time.Time
 	notifyUpdateState chan struct{}
 	StateHistory      []RefBoxState
-	Config            RefBoxConfig
+	Config            Config
 	stateHistoryFile  *os.File
 	lastStateFile     *os.File
 	StageTimes        map[RefBoxStage]time.Duration
 	Publisher         RefBoxPublisher
 }
 
 func NewRefBox() (refBox *RefBox) {
+
 	refBox = new(RefBox)
+	refBox.Config = loadConfig()
 	refBox.timer = timer.NewTimer()
 	refBox.notifyUpdateState = make(chan struct{})
 	refBox.MatchTimeStart = time.Unix(0, 0)
-	refBox.Config = LoadRefBoxConfig(configFileName)
 	refBox.State = NewRefBoxState(refBox.Config)
 	refBox.Publisher = NewRefBoxPublisher(refBox.Config.Publish.Address)
 
 	return
 }
 
+func loadConfig() Config {
+	config, err := LoadConfig(configFileName)
+	if err != nil {
+		log.Printf("Warning: Could not load config: %v", err)
+	}
+	return config
+}
+
 func RunRefBox() {
 	refBox.Run()
 }

internal/app/controller/state.go

@@ -76,7 +76,7 @@ type RefBoxState struct {
 	TeamState       map[Team]*RefBoxTeamState `json:"teamState"`
 }
 
-func NewRefBoxState(config RefBoxConfig) (refBoxState *RefBoxState) {
+func NewRefBoxState(config Config) (refBoxState *RefBoxState) {
 	refBoxState = new(RefBoxState)
 	refBoxState.Stage = StagePreGame
 	refBoxState.GameState = GameStateHalted