MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-11-09 21:49:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Retina 0.3.2, better TEARDOWNs

Browse Source
This commit is contained in:
Scott Lamb
2021-09-29 05:55:12 -07:00
parent 74b9f36a75
commit 095417bb20
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/src/streamer.rs
View File

@@ -116,19 +116,22 @@ where
loop {
let status = self.session_group.stale_sessions();
if let Some(max_expires) = status.max_expires {
if let Some(d) = max_expires.checked_duration_since(tokio::time::Instant::now()) {
log::info!(
"{}: Waiting {:?} for {} stale sessions to expire",
&self.short_name,
d,
status.num_sessions
);
self.shutdown_rx.wait_for(d)?;
waited = true;
}
log::info!(
"{}: waiting up to {:?} for TEARDOWN or expiration of {} stale sessions",
&self.short_name,
max_expires.saturating_duration_since(tokio::time::Instant::now()),
status.num_sessions
);
tokio::runtime::Handle::current().block_on(async {
tokio::select! {
_ = self.session_group.await_stale_sessions(&status) => Ok(()),
_ = self.shutdown_rx.as_future() => Err(base::shutdown::ShutdownError),
}
})?;
waited = true;
} else {
if waited {
log::info!("{}: Done waiting", &self.short_name);
log::info!("{}: done waiting; no more stale sessions", &self.short_name);
}
break;
}