dont panic and log when new config found

Author: enochtangg

runtime_config_defaults.yaml

@@ -51,9 +51,8 @@ async fn log_task_completion(name: &str, task: JoinHandle<Result<(), Error>>) {
 async fn main() -> Result<(), Error> {
     let args = Args::parse();
     let config = Arc::new(Config::from_args(&args)?);
-    let runtime_config = Arc::new(RuntimeConfigManager::new(
-        config.runtime_config_path.clone(),
-    ));
+    let runtime_config =
+        Arc::new(RuntimeConfigManager::new(config.runtime_config_path.clone()).await);
 
     println!("taskbroker starting");
     println!("version: {}", get_version().trim());

src/main.rs

@@ -1,8 +1,9 @@
 use serde::Deserialize;
+use tokio::fs;
 use tokio::sync::RwLock;
-use tracing::info;
+use tracing::{error, info};
 
-#[derive(Debug, Deserialize, Clone)]
+#[derive(Debug, Deserialize, Clone, PartialEq, Default)]
 pub struct RuntimeConfig {
     /// A list of tasks to drop before inserting into sqlite.
     pub drop_task_killswitch: Vec<String>,
@@ -14,25 +15,46 @@ pub struct RuntimeConfigManager {
 }
 
 impl RuntimeConfigManager {
-    pub fn new(path: String) -> Self {
-        let runtime_config = Self::read_yaml_file(&path);
+    pub async fn new(path: String) -> Self {
+        let runtime_config = Self::read_yaml_file(&path).await;
         Self {
             config: RwLock::new(runtime_config),
             path,
         }
     }
 
-    fn read_yaml_file(path: &str) -> RuntimeConfig {
-        let contents = std::fs::read_to_string(path)
-            .unwrap_or_else(|_| panic!("Failed to read config file from {}", path));
-        serde_yaml::from_str(&contents)
-            .unwrap_or_else(|_| panic!("Failed to parse YAML from {}", path))
+    async fn read_yaml_file(path: &str) -> RuntimeConfig {
+        let contents = fs::read_to_string(path).await;
+        match contents {
+            Ok(contents) => {
+                let runtime_config = serde_yaml::from_str::<RuntimeConfig>(&contents);
+                match runtime_config {
+                    Ok(runtime_config) => runtime_config,
+                    Err(e) => {
+                        error!("Using default runtime configs. Failed to parse file: {}", e);
+                        RuntimeConfig::default()
+                    }
+                }
+            }
+            Err(e) => {
+                error!(
+                    "Using default runtime configs. Failed to read yaml file: {}",
+                    e
+                );
+                RuntimeConfig::default()
+            }
+        }
     }
 
-    pub async fn reload_config(&self) {
-        let new_config = Self::read_yaml_file(&self.path);
-        *self.config.write().await = new_config;
-        info!("Reloaded runtime config from {}", self.path);
+    pub async fn reload_config(&self) -> Result<bool, anyhow::Error> {
+        let new_config = Self::read_yaml_file(&self.path).await;
+        if new_config != *self.config.read().await {
+            *self.config.write().await = new_config;
+            info!("Reloaded new runtime config from {}", self.path);
+            Ok(true)
+        } else {
+            Ok(false)
+        }
     }
 
     pub async fn read(&self) -> RuntimeConfig {
@@ -54,7 +76,7 @@ drop_task_killswitch:
         let test_path = "runtime_test_config.yaml";
         std::fs::write(test_path, test_yaml).unwrap();
 
-        let runtime_config = RuntimeConfigManager::new(test_path.to_string());
+        let runtime_config = RuntimeConfigManager::new(test_path.to_string()).await;
         let config = runtime_config.read().await;
         assert_eq!(config.drop_task_killswitch.len(), 1);
         assert_eq!(config.drop_task_killswitch[0], "test:do_nothing");
@@ -68,7 +90,7 @@ drop_task_killswitch:
         )
         .unwrap();
 
-        runtime_config.reload_config().await;
+        let _ = runtime_config.reload_config().await;
         let config = runtime_config.read().await;
         assert_eq!(config.drop_task_killswitch.len(), 2);
         assert_eq!(config.drop_task_killswitch[0], "test:do_nothing");