Fix config file search location

Set cwd in launch task to executable parent folder
paulscherrerinstitute · Aug 28, 2024 · 17937eb · 17937eb
1 parent 372fc28
commit 17937eb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/openem-ingestor/.vscode/launch.json b/openem-ingestor/.vscode/launch.json
@@ -8,7 +8,7 @@
       "mode": "exec",
       "program": "${workspaceFolder}/desktop-app/build/bin/openem-ingestor",
       "preLaunchTask": "build app",
-      "cwd": "${workspaceFolder}",
+      "cwd": "${workspaceFolder}/desktop-app/build/bin",
       "env": {}
     },
     {
@@ -18,7 +18,7 @@
       "mode": "exec",
       "program": "${workspaceFolder}/service/build/bin/openem-ingestor",
       "preLaunchTask": "build service",
-      "cwd": "${workspaceFolder}",
+      "cwd": "${workspaceFolder}/service/build/bin",
       "env": {}
     }
   ]

diff --git a/openem-ingestor/.vscode/tasks.json b/openem-ingestor/.vscode/tasks.json
@@ -6,7 +6,7 @@
       "type": "shell",
       "command": "cp",
       "args": [
-        "${workspaceFolder}/core/openem-ingestor-config.yaml",
+        "${workspaceFolder}/desktop-app/openem-ingestor-config.yaml",
         "${workspaceFolder}/desktop-app/build/bin/"
       ]
     },
@@ -15,7 +15,7 @@
       "type": "shell",
       "command": "cp",
       "args": [
-        "${workspaceFolder}/core/openem-ingestor-config.yaml",
+        "${workspaceFolder}/service/openem-ingestor-config.yaml",
         "${workspaceFolder}/service/build/bin/"
       ]
     },

diff --git a/openem-ingestor/core/config.go b/openem-ingestor/core/config.go
@@ -54,9 +54,7 @@ func ReadConfig() error {
 	userConfigDir, _ := os.UserConfigDir()
 	viper.AddConfigPath(userConfigDir)
 
-	// these paths are mostly for development
 	viper.AddConfigPath("./")
-	viper.AddConfigPath("./core")
 
 	err := viper.ReadInConfig()
 	return err

diff --git a/...ingestor/core/openem-ingestor-config.yaml → ...estor/service/openem-ingestor-config.yaml b/...ingestor/core/openem-ingestor-config.yaml → ...estor/service/openem-ingestor-config.yaml