opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 05:43:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Fix config flag being ignored

Browse Source 
Passing --config had no effect when passed.  It will now be applied as
the last config file and before any env var overrrides.
This commit is contained in:
Jason Wilder
2015-02-15 14:57:49 -07:00
parent 9223c95481
commit b6428b08d0
8 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/setting/setting_test.go
View File

@ -15,7 +15,7 @@ func TestLoadingSettings(t *testing.T) {
Convey("Testing loading settings from ini file", t, func() {
Convey("Given the default ini files", func() {
NewConfigContext()
NewConfigContext("")
So(AppName, ShouldEqual, "Grafana")
So(AdminUser, ShouldEqual, "admin")
@ -23,7 +23,7 @@ func TestLoadingSettings(t *testing.T) {
Convey("Should be able to override via environment variables", func() {
os.Setenv("GF_SECURITY_ADMIN_USER", "superduper")
NewConfigContext()
NewConfigContext("")
So(AdminUser, ShouldEqual, "superduper")
})