Browse Source

fix(logging): added extra logging when default config file is not found (ie homepath is not correct), fixes #6829

Torkel Ödegaard 9 years ago
parent
commit
88e1d56bc2
1 changed files with 10 additions and 1 deletions
  1. 10 1
      pkg/setting/setting.go

+ 10 - 1
pkg/setting/setting.go

@@ -360,9 +360,18 @@ func loadConfiguration(args *CommandLineArgs) {
 	defaultConfigFile := path.Join(HomePath, "conf/defaults.ini")
 	configFiles = append(configFiles, defaultConfigFile)
 
+	// check if config file exists
+	if _, err := os.Stat(defaultConfigFile); os.IsNotExist(err) {
+		fmt.Println("Grafana-server Init Failed: Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath")
+		os.Exit(1)
+	}
+
+	// load defaults
 	Cfg, err = ini.Load(defaultConfigFile)
 	if err != nil {
-		log.Fatal(3, "Failed to parse defaults.ini, %v", err)
+		fmt.Println(fmt.Sprintf("Failed to parse defaults.ini, %v", err))
+		os.Exit(1)
+		return
 	}
 
 	Cfg.BlockMode = false