perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More descriptive error if config couldn't be loaded

Browse Source
This commit is contained in:
Jakob Borg
2014-10-13 15:59:02 +02:00
parent ef616ff25b
commit 79c3ea82c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/syncthing/main.go
View File

@@ -347,8 +347,8 @@ func syncthingMain() {
// If it does not, create a template. // If it does not, create a template.
if info, err := os.Stat(cfgFile); err == nil { if info, err := os.Stat(cfgFile); err == nil {
if info.IsDir() { if !info.Mode().IsRegular() {
l.Fatalln("config file is a directory!") l.Fatalln("Config file is not a file?")
} }
cfg, err = config.Load(cfgFile, myID) cfg, err = config.Load(cfgFile, myID)
if err == nil { if err == nil {
@@ -359,7 +359,7 @@ func syncthingMain() {
myName = myCfg.Name myName = myCfg.Name
} }
} else { } else {
l.Fatalln("Could not load config file, refusing to replace with empty defaults") l.Fatalln("Configuration:", err)
} }
} else { } else {
l.Infoln("No config file; starting with empty defaults") l.Infoln("No config file; starting with empty defaults")