diff --git a/configuration.go b/configuration.go deleted file mode 100644 index d2c6a46..0000000 --- a/configuration.go +++ /dev/null @@ -1,38 +0,0 @@ -package main - -import ( - "encoding/json" - "fmt" - "os" -) - -type Configuration struct { - ListenAddress string `json:"listen-address"` - Processes []Process `json:"processes"` -} - -func LoadConfiguration(path string) (conf *Configuration, err error) { - f, err := os.Open(path) - if err != nil { - return nil, err - } - defer f.Close() - - conf = &Configuration{} - - if err := json.NewDecoder(f).Decode(conf); err != nil { - return nil, err - } - - for i := 0; i < len(conf.Processes); i++ { - if conf.Processes[i].Process == "" { - return nil, fmt.Errorf("an empty process field found") - } - - if conf.Processes[i].Alias == "" { - conf.Processes[i].Alias = conf.Processes[i].Process - } - } - - return conf, nil -} diff --git a/main.go b/main.go index c8ee25a..a1b633e 100644 --- a/main.go +++ b/main.go @@ -41,6 +41,37 @@ func GetProcessesState(procs *[]Process) (ps ProcessesState) { return } +type Configuration struct { + ListenAddress string `json:"listen-address"` + Processes []Process `json:"processes"` +} + +func LoadConfiguration(path string) (conf *Configuration, err error) { + f, err := os.Open(path) + if err != nil { + return nil, err + } + defer f.Close() + + conf = &Configuration{} + + if err := json.NewDecoder(f).Decode(conf); err != nil { + return nil, err + } + + for i := 0; i < len(conf.Processes); i++ { + if conf.Processes[i].Process == "" { + return nil, fmt.Errorf("an empty process field found") + } + + if conf.Processes[i].Alias == "" { + conf.Processes[i].Alias = conf.Processes[i].Process + } + } + + return conf, nil +} + func main() { log.SetFlags(0) flag.Parse()