diff options
Diffstat (limited to 'config.go')
| -rw-r--r-- | config.go | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -29,23 +29,24 @@ var ErrorParseXML error = errors.New("invalid xml") // something is wrong somewhere and sometimes the // protobuf json files get written out with garbage -func cfgfile() { +func cfgfile() error { err := readConfigFile("virtigo.json") if err == nil { - return - } - if err == ErrorParseJSON { - os.Exit(-1) + return err } + // test last config also parses err = readConfigFile("virtigo.json.last") if err == nil { - log.Info("read json failed", err) - os.Exit(-1) + return err } - if err == ErrorNoFile { - log.Info("no config file created yet", err) - os.Exit(-1) + + // try parsing event log + e, err := pb.ReadEventsConfig() + if err == nil { + return err } + me.events = e + return nil } func readConfigFile(filename string) error { |
