misc

scouter-contrib · Jan 17, 2021 · bed5c86 · bed5c86
1 parent fb11858
commit bed5c86
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/scouterx/conf/configure.go b/scouterx/conf/configure.go
@@ -140,10 +140,18 @@ func (conf *Configure) run() {
 }
 
 func getConfFilePath() string {
-	path := util.GetScouterPath()
-	confPath := filepath.Join(path, "conf")
-	util.MakeDir(confPath)
-	return filepath.Join(path, "conf", "scouter.conf")
+	scouterConfFile := os.Getenv("SCOUTER_CONFIG")
+	if scouterConfFile == "" {
+		scouterConfFile = os.Getenv("scouter.config")
+	}
+	if scouterConfFile == "" {
+		path := util.GetScouterPath()
+		confPath := filepath.Join(path, "conf")
+		util.MakeDir(confPath)
+		scouterConfFile = filepath.Join(path, "conf", "scouter.conf")
+	}
+
+	return scouterConfFile
 }
 
 func (conf *Configure) SetTrace(mode bool) {