Lock alarms when initializing

This means that online_status_workers wait before the alarms are initialized.

Author: syyyr

Cargo.lock

@@ -3,7 +3,7 @@ name = "historyprovider"
 description = "historyprovider-rs"
 license = "MIT"
 repository = "https://github.com/silicon-heaven/historyprovider-rs"
-version = "2.11.0"
+version = "2.11.1"
 edition = "2024"
 
 [profile.release]

Cargo.toml

@@ -553,6 +553,10 @@ pub(crate) async fn sites_task(
                         online_status_channels.insert(site.to_string(), tx);
                         online_status_workers.push(online_status_worker(site.clone(), rx, client_cmd_tx.clone(), app_state.clone()));
                     }
+
+                    let alarms = &mut *app_state.alarms.write().await;
+                    let state_alarms = &mut *app_state.state_alarms.write().await;
+
                     online_status_task = Some(tokio::spawn(async move {
                         debug!(target: "OnlineStatus", "online status task starts");
                         futures::future::join_all(online_status_workers).await;
@@ -564,8 +568,7 @@ pub(crate) async fn sites_task(
                         with_snapshot: true,
                         ..Default::default()
                     };
-                    let mut alarms = BTreeMap::<String, Vec<AlarmWithTimestamp>>::new();
-                    let mut state_alarms = BTreeMap::<String, Vec<AlarmWithTimestamp>>::new();
+
                     for site_path in sites_info.keys() {
                         if app_state.app_closing.load(std::sync::atomic::Ordering::Relaxed) {
                             break;
@@ -592,13 +595,10 @@ pub(crate) async fn sites_task(
                             }
                         };
 
-                        impl_update_alarms(&mut alarms, collect_alarms);
-                        impl_update_alarms(&mut state_alarms, collect_state_alarms);
+                        impl_update_alarms(alarms, collect_alarms);
+                        impl_update_alarms(state_alarms, collect_state_alarms);
                     }
 
-                    *app_state.alarms.write().await = alarms;
-                    *app_state.state_alarms.write().await = state_alarms;
-
                     periodic_sync_tx
                         .unbounded_send(PeriodicSyncCommand::Enable)
                         .unwrap_or_else(|e| log::error!("Cannot send periodic sync enable command: {e}"));