Fixed loading config path

cego · Nov 26, 2021 · 3d02558 · 3d02558
1 parent 2be87d0
commit 3d02558
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -71,12 +71,24 @@ func initConfig() {
 	config = nebula.NewConfig(l)
 
 	if configPath == "" {
-		configPath = getConfigDir()
+		configPath = getConfigPath()
 	}
 
 	if configPath != "" {
-		configDir = filepath.Dir(configPath)
-		err := config.Load(configPath)
+
+		configPathInfo, err := os.Stat(configPath)
+		if err != nil {
+			l.WithError(err).Errorln("failed to load config")
+			os.Exit(1)
+		}
+
+		if configPathInfo.IsDir() {
+			configDir = configPath
+		} else {
+			configDir = filepath.Dir(configPath)
+		}
+
+		err = config.Load(configPath)
 		if err != nil {
 			l.WithError(err).Errorln("failed to load config")
 			os.Exit(1)
@@ -96,6 +108,8 @@ func initConfig() {
 		l.Errorf("failed to detect config path")
 		os.Exit(1)
 	}
+	l.Tracef("using config: %s", configPath)
+	l.Tracef("using config dir: %s", configDir)
 }
 
 func main() {

diff --git a/cmd/agent/utils.go b/cmd/agent/utils.go
@@ -27,7 +27,7 @@ func dirExists(path string) (bool, os.FileInfo) {
 	return fileinfo.IsDir(), fileinfo
 }
 
-func getConfigDir() string {
+func getConfigPath() string {
 	ok, _ := dirExists("/etc/nebula-provisioner")
 	if ok {
 		return "/etc/nebula-provisioner"