Merge pull request #2212 from reubenmiller/fix-tedge-log-plugin-incon…

…sistencies fix: align tedge-log-plugin settings
thin-edge · Sep 3, 2023 · 7436693 · 7436693 · github-actions · Sep 4, 2023
2 parents 47baff1 + d8e5443
commit 7436693
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/common/tedge_config/src/tedge_config_cli/tedge_config.rs b/crates/common/tedge_config/src/tedge_config_cli/tedge_config.rs
@@ -102,15 +102,6 @@ impl TEdgeConfig {
         }
         client_auth
     }
-
-    pub fn mqtt_internal_config(&self) -> mqtt_channel::Config {
-        let host = self.mqtt.bind.address.to_string();
-        let port = self.mqtt.bind.port.get();
-
-        mqtt_channel::Config::default()
-            .with_host(host)
-            .with_port(port)
-    }
 }
 
 #[derive(serde::Deserialize, serde::Serialize, Clone, Copy, PartialEq, Eq, Debug)]

diff --git a/plugins/tedge_log_plugin/src/main.rs b/plugins/tedge_log_plugin/src/main.rs
@@ -58,7 +58,7 @@ async fn main() -> Result<(), anyhow::Error> {
     let tedge_config_location = TEdgeConfigLocation::from_custom_root(&logfile_opt.config_dir);
 
     let log_level = if logfile_opt.debug {
-        tracing::Level::TRACE
+        tracing::Level::DEBUG
     } else {
         get_log_level(
             "tedge-log-plugin",
@@ -87,10 +87,11 @@ async fn run(
     let runtime_events_logger = None;
     let mut runtime = Runtime::try_new(runtime_events_logger).await?;
 
-    let mqtt_config = tedge_config
-        .mqtt_internal_config()
-        .with_session_name(TEDGE_LOG_PLUGIN);
-    let mut mqtt_actor = MqttActorBuilder::new(mqtt_config);
+    let mqtt_config = tedge_config.mqtt_config()?;
+    let mut mqtt_actor = MqttActorBuilder::new(mqtt_config.clone().with_session_name(format!(
+        "{}#{}/{}",
+        TEDGE_LOG_PLUGIN, topic_root, topic_identifier
+    )));
 
     let mut fs_watch_actor = FsWatchActorBuilder::new();