diff --git a/crates/core/src/bc_protocol/connection/udpsource.rs b/crates/core/src/bc_protocol/connection/udpsource.rs index 3e55b73..b0ad7f9 100644 --- a/crates/core/src/bc_protocol/connection/udpsource.rs +++ b/crates/core/src/bc_protocol/connection/udpsource.rs @@ -401,7 +401,7 @@ impl UdpPayloadInner { Ok(()) } => v, }; - log::debug!("UdpPayloadInner::new SendToSocket Cancel"); + log::debug!("UdpPayloadInner::new SendToSocket Cancel: {:?}", result); send_cancel.cancel(); result }); diff --git a/src/mqtt/mod.rs b/src/mqtt/mod.rs index dd0e274..0cba897 100644 --- a/src/mqtt/mod.rs +++ b/src/mqtt/mod.rs @@ -258,7 +258,7 @@ async fn listen_on_camera(camera: NeoInstance, mqtt_instance: MqttInstance) -> R let mut config; let cancel = CancellationToken::new(); let drop_cancel = cancel.clone().drop_guard(); - loop { + let r = loop { config = watch_config.borrow().clone().mqtt; break tokio::select! { v = watch_config.wait_for(|new_config| config != new_config.mqtt) => { @@ -545,10 +545,11 @@ async fn listen_on_camera(camera: NeoInstance, mqtt_instance: MqttInstance) -> R AnyResult::Ok(()) } => v, }; - }?; + }; - log::debug!("Mqtt::listen_on_camera Cancel"); + log::debug!("Mqtt::listen_on_camera Cancel: {r:?}"); drop(drop_cancel); + r?; Ok(()) } diff --git a/src/rtsp/stream.rs b/src/rtsp/stream.rs index 0345a60..ce86f33 100644 --- a/src/rtsp/stream.rs +++ b/src/rtsp/stream.rs @@ -439,7 +439,12 @@ async fn stream_run( fn check_live(app: &AppSrc) -> Result<()> { // log::debug!("Checking Live: {:?}", app.bus()); - app.bus().map(|_| ()).ok_or(anyhow!("App source is closed")) + app.bus().ok_or(anyhow!("App source is closed"))?; + app.pads() + .iter() + .all(|pad| pad.is_linked()) + .then_some(()) + .ok_or(anyhow!("App source is closed")) } fn get_runtime(app: &AppSrc) -> Option {