feat(alerting/annotations): fixed broken test

This commit is contained in:
Torkel Ödegaard
2016-09-08 13:22:30 +02:00
parent b8081b29fd
commit 23de094a81
2 changed files with 8 additions and 6 deletions
+6 -5
View File
@@ -47,10 +47,11 @@ var (
BuildStamp int64
// Paths
LogsPath string
HomePath string
DataPath string
PluginsPath string
LogsPath string
HomePath string
DataPath string
PluginsPath string
CustomInitPath = "conf/custom.ini"
// Log settings.
LogModes []string
@@ -312,7 +313,7 @@ func evalConfigValues() {
func loadSpecifedConfigFile(configFile string) error {
if configFile == "" {
configFile = filepath.Join(HomePath, "conf/custom.ini")
configFile = filepath.Join(HomePath, CustomInitPath)
// return without error if custom file does not exist
if !pathExists(configFile) {
return nil