Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pr-840' 

* pr-840:
  More descriptive error if config couldn't be loaded
  Better handling of wrong config files
This commit is contained in:
Jakob Borg 2014-10-13 16:02:14 +02:00
parent 4b92960975 79c3ea82c7
commit 244a22755c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/syncthing/main.go
View File

@ -346,13 +346,20 @@ func syncthingMain() {
// Load the configuration file, if it exists. // Load the configuration file, if it exists.
// If it does not, create a template. // If it does not, create a template.
cfg, err = config.Load(cfgFile, myID) if info, err := os.Stat(cfgFile); err == nil {
if err == nil { if !info.Mode().IsRegular() {
myCfg := cfg.Devices()[myID] l.Fatalln("Config file is not a file?")
if myCfg.Name == "" { }
myName, _ = os.Hostname() cfg, err = config.Load(cfgFile, myID)
if err == nil {
myCfg := cfg.Devices()[myID]
if myCfg.Name == "" {
myName, _ = os.Hostname()
} else {
myName = myCfg.Name
}
} else { } else {
myName = myCfg.Name l.Fatalln("Configuration:", err)
} }
} else { } else {
l.Infoln("No config file; starting with empty defaults") l.Infoln("No config file; starting with empty defaults")