IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'external-plugins'

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-12-15 10:10:48 +01:00
parent f163ceffd0 201f50b121
commit 2ec5bc77d7
85 changed files with 1123 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/setting/setting.go
View File

@@ -287,13 +287,11 @@ func loadSpecifedConfigFile(configFile string) {
defaultSec, err := Cfg.GetSection(section.Name())
if err != nil {
log.Error(3, "Unknown config section %s defined in %s", section.Name(), configFile)
continue
defaultSec, _ = Cfg.NewSection(section.Name())
}
defaultKey, err := defaultSec.GetKey(key.Name())
if err != nil {
log.Error(3, "Unknown config key %s defined in section %s, in file %s", key.Name(), section.Name(), configFile)
continue
defaultKey, _ = defaultSec.NewKey(key.Name(), key.Value())
}
defaultKey.SetValue(key.Value())
}