diff --git a/pkg/metrics/graphite_test.go b/pkg/metrics/graphite_test.go index 2f866ddd7b6..ff2bf530d5e 100644 --- a/pkg/metrics/graphite_test.go +++ b/pkg/metrics/graphite_test.go @@ -10,6 +10,8 @@ import ( func TestGraphitePublisher(t *testing.T) { + setting.CustomInitPath = "conf/does_not_exist.ini" + Convey("Test graphite prefix replacement", t, func() { var err error err = setting.NewConfigContext(&setting.CommandLineArgs{ @@ -67,7 +69,6 @@ func TestGraphitePublisher(t *testing.T) { _, err = setting.Cfg.NewSection("metrics.graphite") - setting.InstanceName = "hostname.with.dots.com" publisher, err := CreateGraphitePublisher() So(err, ShouldBeNil) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index fd010c42ca2..33b026713a1 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -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