Send pings regardless of state

This commit is contained in:
QuantumEntangledAndy committed 2023-08-21 19:10:46 +07:00
1 parent 48892344b8
commit 0768bcf959
2 files changed
+15 -17

No files matched your search

+14 -2
View File
@@ -58,8 +58,8 @@ use log::*;
use neolink_core::bc_protocol::{BcCamera, StreamKind};
use std::collections::HashSet;
use std::sync::Arc;
use std::time::Duration;
use tokio_stream::StreamExt;
use tokio::time::{interval, Duration};
use tokio_stream::{wrappers::IntervalStream, StreamExt};
mod cmdline;
mod gst;
@@ -260,6 +260,18 @@ async fn camera_main(camera: Camera<Disconnected>) -> Result<(), CameraFailureKi
info!("{}: Join Pause", name);
Ok(StreamChange::StreamError(v))
},
// Send pings
v = async {
let camera = streaming.get_camera();
let mut interval = IntervalStream::new(interval(Duration::from_secs(5)));
while let Some(_update) = interval.next().await {
if camera.ping().await.is_err() {
break;
}
}
futures::pending!(); // Never actually finish, has to be aborted
Ok(())
} => Ok(StreamChange::StreamError(v)),
v = await_change(
streaming.get_camera(),
&streaming.shared,
+1 -15
View File
@@ -11,8 +11,7 @@ use log::*;
use neolink_core::bcmedia::model::BcMedia;
use tokio::sync::RwLock;
use tokio::task::JoinHandle;
use tokio::time::{interval, timeout, Duration};
use tokio_stream::wrappers::IntervalStream;
use tokio::time::{timeout, Duration};
use neolink_core::bc_protocol::{BcCamera, StreamKind as Stream};
@@ -158,23 +157,10 @@ impl Camera<Streaming> {
Ok(())
} => v,
v = self.state.camera.join() => v.map_err(|e| anyhow!("Camera join error: {:?}", e)),
v = self.keepalive() => {v},
}?;
Ok(())
}
async fn keepalive(&self) -> Result<()> {
let mut interval = IntervalStream::new(interval(Duration::from_secs(5)));
while let Some(_update) = interval.next().await {
if self.state.camera.ping().await.is_err() {
break;
}
}
futures::pending!(); // Never actually finish, has to be aborted
Ok(())
}
pub(crate) fn get_camera(&self) -> &BcCamera {
&self.state.camera
}