debug settings dir

Author: michaelmattig

services/src/bin/main.rs

@@ -14,7 +14,9 @@ use tracing_subscriber::EnvFilter;
 use tracing_subscriber::Layer;
 
 #[tokio::main]
+#[allow(clippy::dbg_macro)]
 async fn main() {
+    dbg!(std::env::var("GEOENGINE_SETTINGS_FILE_PATH").unwrap());
     start_server().await.unwrap();
 }
 

services/src/util/config.rs

@@ -18,6 +18,7 @@ static SETTINGS: OnceLock<RwLock<Config>> = OnceLock::new();
 const SETTINGS_FILE_PATH_OVERRIDE_ENV_VAR: &str = "GEOENGINE_SETTINGS_FILE_PATH";
 
 // TODO: change to `LazyLock' once stable
+#[allow(clippy::dbg_macro)]
 fn init_settings() -> RwLock<Config> {
     let mut settings = Config::builder();
 
@@ -29,16 +30,22 @@ fn init_settings() -> RwLock<Config> {
     settings = settings.add_source(File::from_str(default_settings, FileFormat::Toml));
 
     if let Ok(settings_file_path) = std::env::var(SETTINGS_FILE_PATH_OVERRIDE_ENV_VAR) {
+        dbg!(
+            "Settings file path: {} (set by environment variable)",
+            &settings_file_path
+        );
         // override the settings file path
         settings = settings.add_source(File::with_name(&settings_file_path));
     } else {
         // use the default settings file path
         #[cfg(test)]
         {
+            dbg!("Settings file path: Settings-test.toml");
             settings = settings.add_source(File::from(dir.join("Settings-test.toml")));
         }
         #[cfg(not(test))]
         {
+            dbg!("Settings file path: Settings.toml");
             settings = settings.add_source(File::from(dir.join("Settings.toml")));
         }
     }

services/tests/startup.rs

@@ -19,6 +19,7 @@ impl Drop for DroppingServer {
 impl DroppingServer {
     fn new(schema_name: &str) -> Self {
         let dir = geoengine_services::util::config::retrieve_settings_dir().unwrap();
+        eprintln!("Settings dir: {:?}", dir);
 
         let process = Command::cargo_bin("main")
             .unwrap()
@@ -62,7 +63,7 @@ async fn it_starts_without_warnings_and_accepts_connections() {
         // read log output and check for warnings
         let mut startup_succesful = false;
         for line in server.stderr_lines().take(100) {
-            // eprintln!("Line: {line}");
+            eprintln!("Line: {line}");
 
             assert!(!line.contains("WARN"), "Warning in log output: {line}");