mirror of
https://github.com/grafana/grafana.git
synced 2026-07-29 15:59:50 -05:00
feat(alerting/annotations): fixed broken test
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user