load configs from project root

vgarvardt · Jul 31, 2014 · 0bbed8b · 0bbed8b
1 parent 087b4de
commit 0bbed8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,5 +28,5 @@ _testmain.go
 data/*
 
 # Ignore env config files, except for the default one
-cfg/*.ini
-!cfg/config.ini
+*.ini
+!config.ini
diff --git a/cfg/cfg.go b/cfg/cfg.go
@@ -49,10 +49,10 @@ func init() {
 	stdlogger = log.New(os.Stdout, "", 0)
 	Log(fmt.Sprintf("Loading config with env set to %s", env))
 
-	filePath := fmt.Sprintf("./cfg/%s.ini", env)
+	filePath := fmt.Sprintf("./%s.ini", env)
 	if _, err := os.Stat(filePath); os.IsNotExist(err) {
-		Log(fmt.Sprintf("Loading config from ./cfg/config.ini"))
-		reader, _ = config.ReadDefault("./cfg/config.ini")
+		Log(fmt.Sprintf("Loading config from ./config.ini"))
+		reader, _ = config.ReadDefault("./config.ini")
 	} else {
 		Log(fmt.Sprintf("Loading config from %s", filePath))
 		reader, _ = config.ReadDefault(filePath)

diff --git a/cfg/config.ini → config.ini b/cfg/config.ini → config.ini