Add last_sites_loaded

Author: syyyr

src/lib.rs

@@ -100,6 +100,7 @@ pub struct State {
     sync_cmd_tx: DedupSender<sync::SyncCommand>,
     dirtylog_cmd_tx: UnboundedSender<dirtylog::DirtyLogCommand>,
     app_closing: AtomicBool,
+    last_sites_loaded: RwLock<Option<std::time::Instant>>,
 }
 
 #[derive(Default)]
@@ -148,6 +149,7 @@ pub fn make_client(hp_config: &HpConfig, tasks: &mut AppTasks) -> shvrpc::Result
         sync_cmd_tx,
         dirtylog_cmd_tx,
         app_closing: AtomicBool::new(false),
+        last_sites_loaded: RwLock::new(None),
     });
 
     let client = shvclient::Client::new()

src/sites.rs

@@ -638,6 +638,7 @@ pub(crate) async fn sites_task(
                         .unbounded_send(PeriodicSyncCommand::Enable)
                         .unwrap_or_else(|e| log::error!("Cannot send periodic sync enable command: {e}"));
 
+                    *app_state.last_sites_loaded.write().await = Some(std::time::Instant::now());
                 },
                 Event::ClientEvent(ClientEvent::Disconnected) | Event::ClientEvent(ClientEvent::ConnectionFailed(_)) => {
                     subscribers.clear();

src/tree.rs

@@ -49,6 +49,7 @@ const META_METHOD_PUSH_LOG: MetaMethod = MetaMethod::new_static(METH_PUSH_LOG, s
 const METH_VERSION: &str = "version";
 const METH_UPTIME: &str = "uptime";
 const METH_RELOAD_SITES: &str = "reloadSites";
+const METH_LAST_SITES_LOADED: &str = "lastSitesLoaded";
 
 // File nodes methods
 const METH_HASH: &str = "hash";
@@ -615,6 +616,7 @@ pub(crate) async fn request_handler(
                 MetaMethod::new_static(METH_VERSION, shvrpc::metamethod::Flags::None, AccessLevel::Read, "Null", "String", &[], ""),
                 MetaMethod::new_static(METH_UPTIME, shvrpc::metamethod::Flags::None, AccessLevel::Read, "Null", "String", &[], ""),
                 MetaMethod::new_static(METH_RELOAD_SITES, shvrpc::metamethod::Flags::None, AccessLevel::Write, "Null", "Bool", &[], ""),
+                MetaMethod::new_static(METH_LAST_SITES_LOADED, shvrpc::metamethod::Flags::None, AccessLevel::Read, "Null", "DateTime", &[], ""),
                 META_METHOD_ALARM_LOG,
                 // TODO: All root node methods:
                 // appName
@@ -654,6 +656,9 @@ pub(crate) async fn request_handler(
                         sites_cmd_tx.unbounded_send(crate::sites::SitesCommand::ReloadSites).map_err(|err| RpcError::new(RpcErrorCode::InternalError, format!("Couldn't reload sites: {err}")))?;
                         Ok("Sites queued for a reload. This might take a while.".to_string())
                     }),
+                    METH_LAST_SITES_LOADED => m.resolve(METHODS, async move || {
+                        Ok(app_state.last_sites_loaded.read().await.map(|last_sites_loaded| humantime::format_duration(std::time::Duration::from_secs(last_sites_loaded.elapsed().as_secs())).to_string()))
+                    }),
                     _ => err_unresolved_request(),
                 }
             }