added unit test for loading configuration file

This commit is contained in:
Torkel Ödegaard
2015-02-12 11:55:55 +01:00
parent 4df6668416
commit 2c16b0f0f3
3 changed files with 29 additions and 9 deletions
+7 -6
View File
@@ -98,15 +98,10 @@ var (
func init() {
IsWindows = runtime.GOOS == "windows"
log.NewLogger(0, "console", `{"level": 0}`)
}
func getWorkDir() string {
p, _ := filepath.Abs(".")
return p
WorkDir, _ = filepath.Abs(".")
}
func findConfigFiles() []string {
WorkDir = getWorkDir()
ConfRootPath = path.Join(WorkDir, "conf")
filenames := make([]string, 0)
@@ -152,6 +147,10 @@ func ToAbsUrl(relativeUrl string) string {
return AppUrl + relativeUrl
}
func loadEnvVariableOverrides() {
}
func NewConfigContext() {
configFiles := findConfigFiles()
@@ -170,6 +169,8 @@ func NewConfigContext() {
}
}
loadEnvVariableOverrides()
AppName = Cfg.Section("").Key("app_name").MustString("Grafana")
Env = Cfg.Section("").Key("app_mode").MustString("development")