Commit 1c9993f1 by Torkel Ödegaard

Backend configuration: When unknown key was detected the log error was not…

Backend configuration: When unknown key was detected the log error was not visible in log file due to logging was initialized after user config file is loaded, logging is now initialized twice, once based on defaults and command line arguments, then then again after user config file, Fixes #1992
parent 2bb63835
...@@ -289,10 +289,13 @@ func loadConfiguration(args *CommandLineArgs) { ...@@ -289,10 +289,13 @@ func loadConfiguration(args *CommandLineArgs) {
// command line props // command line props
commandLineProps := getCommandLineProperties(args.Args) commandLineProps := getCommandLineProperties(args.Args)
// load default overrides // load default overrides
applyCommandLineDefaultProperties(commandLineProps) applyCommandLineDefaultProperties(commandLineProps)
// init logging before specific config so we can log errors from here on
DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath)
initLogging(args)
// load specified config file // load specified config file
loadSpecifedConfigFile(args.Config) loadSpecifedConfigFile(args.Config)
...@@ -304,6 +307,10 @@ func loadConfiguration(args *CommandLineArgs) { ...@@ -304,6 +307,10 @@ func loadConfiguration(args *CommandLineArgs) {
// evaluate config values containing environment variables // evaluate config values containing environment variables
evalConfigValues() evalConfigValues()
// update data path and logging config
DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath)
initLogging(args)
} }
func pathExists(path string) bool { func pathExists(path string) bool {
...@@ -339,9 +346,6 @@ func NewConfigContext(args *CommandLineArgs) { ...@@ -339,9 +346,6 @@ func NewConfigContext(args *CommandLineArgs) {
setHomePath(args) setHomePath(args)
loadConfiguration(args) loadConfiguration(args)
DataPath = makeAbsolute(Cfg.Section("paths").Key("data").String(), HomePath)
initLogging(args)
AppName = Cfg.Section("").Key("app_name").MustString("Grafana") AppName = Cfg.Section("").Key("app_name").MustString("Grafana")
Env = Cfg.Section("").Key("app_mode").MustString("development") Env = Cfg.Section("").Key("app_mode").MustString("development")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment