dbus: rauc: trigger a single poll for updates after reloading the daemon

Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>

Author: hnez

src/dbus/rauc.rs

@@ -21,7 +21,7 @@ use anyhow::Result;
 use async_std::stream::StreamExt;
 use async_std::sync::Arc;
 use futures_util::FutureExt;
-use log::{info, warn};
+use log::{error, info, warn};
 use serde::{Deserialize, Serialize};
 
 use super::systemd::{Service, ServiceAction};
@@ -47,15 +47,31 @@ use installer::InstallerProxy;
 #[cfg(not(feature = "demo_mode"))]
 mod poller;
 
+#[cfg(not(feature = "demo_mode"))]
+use poller::PollerProxy;
+
 #[cfg(feature = "demo_mode")]
 mod imports {
     pub(super) const CHANNELS_DIR: &str = "demo_files/usr/share/tacd/update_channels";
+
+    pub(super) struct PollerProxy<'a> {
+        _dummy: &'a (),
+    }
+
+    impl PollerProxy<'_> {
+        pub async fn new<C>(_conn: C) -> Option<Self> {
+            Some(Self { _dummy: &() })
+        }
+
+        pub async fn poll(&self) -> zbus::Result<()> {
+            Ok(())
+        }
+    }
 }
 
 #[cfg(not(feature = "demo_mode"))]
 mod imports {
     pub(super) use anyhow::bail;
-    pub(super) use log::error;
 
     pub(super) const CHANNELS_DIR: &str = "/usr/share/tacd/update_channels";
 }
@@ -186,11 +202,14 @@ fn would_reboot_into_other_slot(slot_status: &SlotStatus, primary: Option<String
 }
 
 async fn channel_list_update_task(
+    conn: Arc<Connection>,
     reload: Arc<Topic<bool>>,
     enable_polling: Arc<Topic<bool>>,
     channels: Arc<Topic<Channels>>,
     rauc_service: Service,
 ) -> Result<()> {
+    let poller = PollerProxy::new(&conn).await.unwrap();
+
     let (reload_stream, _) = reload.subscribe_unbounded();
     let (mut enable_polling_stream, _) = enable_polling.subscribe_unbounded();
 
@@ -254,6 +273,14 @@ async fn channel_list_update_task(
         } else {
             info!("Config is up to date. Will not reload.");
         }
+
+        if enable_polling {
+            info!("Trigger a poll");
+
+            if let Err(err) = poller.poll().await {
+                error!("Failed to poll for updates: {err}");
+            }
+        }
     }
 }
 
@@ -297,6 +324,7 @@ impl Rauc {
         wtb.spawn_task(
             "rauc-channel-list-update",
             channel_list_update_task(
+                Arc::new(Connection),
                 inst.reload.clone(),
                 inst.enable_polling.clone(),
                 inst.channels.clone(),
@@ -505,6 +533,7 @@ impl Rauc {
         wtb.spawn_task(
             "rauc-channel-list-update",
             channel_list_update_task(
+                conn.clone(),
                 inst.reload.clone(),
                 inst.enable_polling.clone(),
                 inst.channels.clone(),