handle error while adding fsnotify events

Check if the config directory exists or not.

Signed-off-by: Pradeep Kumar K J <[email protected]>

Author: PradeepKiruvale

Cargo.lock

@@ -26,6 +26,9 @@ pub enum TEdgeConfigError {
 
     #[error(transparent)]
     Multi(#[from] Multi),
+
+    #[error(transparent)]
+    DirNotFound(#[from] tedge_utils::paths::PathsError),
 }
 
 impl TEdgeConfigError {

crates/common/tedge_config/src/tedge_config_cli/error.rs

@@ -1,4 +1,5 @@
 use c8y_api::smartrest::topic::C8yTopic;
+use tedge_utils::paths::validate_parent_dir_exists;
 
 use std::path::Path;
 use std::path::PathBuf;
@@ -86,7 +87,7 @@ impl ConfigManagerConfig {
         let tedge_http_address = tedge_config.query(HttpBindAddressSetting)?;
         let tedge_http_port: u16 = tedge_config.query(HttpPortSetting)?.into();
 
-        Ok(ConfigManagerConfig::new(
+        let config = ConfigManagerConfig::new(
             config_dir,
             tmp_dir,
             data_dir,
@@ -95,6 +96,8 @@ impl ConfigManagerConfig {
             mqtt_port,
             tedge_http_address,
             tedge_http_port,
-        ))
+        );
+        validate_parent_dir_exists(config.plugin_config_path.as_path())?;
+        Ok(config)
     }
 }

crates/extensions/c8y_config_manager/src/config.rs

@@ -18,6 +18,7 @@ use tedge_config::TEdgeConfig;
 use tedge_config::TEdgeConfigError;
 use tedge_config::TmpPathSetting;
 use tedge_mqtt_ext::MqttMessage;
+use tedge_utils::paths::validate_parent_dir_exists;
 
 pub const DEFAULT_PLUGIN_CONFIG_FILE_NAME: &str = "c8y-log-plugin.toml";
 pub const DEFAULT_OPERATION_DIR_NAME: &str = "c8y/";
@@ -54,6 +55,7 @@ impl LogManagerConfig {
         let plugin_config_path = config_dir
             .join(DEFAULT_OPERATION_DIR_NAME)
             .join(DEFAULT_PLUGIN_CONFIG_FILE_NAME);
+        validate_parent_dir_exists(&plugin_config_path)?;
 
         let plugin_config = LogPluginConfig::new(&plugin_config_path);
 

crates/extensions/c8y_log_manager/src/config.rs

@@ -11,6 +11,7 @@ repository = { workspace = true }
 
 [dependencies]
 async-trait = "0.1"
+log = "0.4"
 tedge_actors = { path = "../../core/tedge_actors" }
 tedge_utils = { path = "../../common/tedge_utils", features = ["fs-notify"] }
 tokio = { version = "1.23", features = ["macros"] }

crates/extensions/tedge_file_system_ext/Cargo.toml

@@ -1,4 +1,5 @@
 use async_trait::async_trait;
+use log::error;
 use std::path::PathBuf;
 use tedge_actors::futures::channel::mpsc;
 use tedge_actors::futures::StreamExt;
@@ -121,9 +122,14 @@ impl Actor for FsWatchActor {
     }
 
     async fn run(&mut self) -> Result<(), RuntimeError> {
-        let mut fs_notify = NotifyStream::try_default().unwrap();
+        let mut fs_notify = NotifyStream::try_default().map_err(Box::new)?;
         for (watch_path, _) in self.messages.get_watch_dirs().iter() {
-            fs_notify.add_watcher(watch_path).unwrap();
+            if let Err(err) = fs_notify.add_watcher(watch_path) {
+                error!(
+                    "Failed to add file watcher to the {} due to: {err}",
+                    watch_path.display()
+                );
+            }
         }
 
         loop {