From c783f8ad781c15d83edcf1780e79e05b10412e62 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 5 Jun 2020 17:55:02 -0500 Subject: [PATCH] Change return type of start_video to empty enum --- src/bc_protocol.rs | 4 +++- src/lib.rs | 3 +++ src/main.rs | 55 +++++++++++++++++++--------------------------- 3 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index fbc9111..f1d61b8 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -19,6 +19,8 @@ pub struct BcCamera { rx_timeout: Duration, } +use crate::Never; + type Result = std::result::Result; #[derive(Debug, Error)] @@ -240,7 +242,7 @@ impl BcCamera { Ok(()) } - pub fn start_video(&self, data_out: &mut dyn Write) -> Result<()> { + pub fn start_video(&self, data_out: &mut dyn Write) -> Result { let connection = self .connection .as_ref() diff --git a/src/lib.rs b/src/lib.rs index 922d417..fe2d620 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,4 +4,7 @@ pub mod bc; pub mod bc_protocol; pub mod gst; +#[derive(Debug)] +pub enum Never {} + pub use bc_protocol::Error; diff --git a/src/main.rs b/src/main.rs index 7889100..b87b849 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,6 +2,7 @@ use err_derive::Error; use log::*; use neolink::bc_protocol::BcCamera; use neolink::gst::RtspServer; +use neolink::Never; use std::fs; use std::io::Write; use std::time::Duration; @@ -46,39 +47,31 @@ fn main() -> Result<(), Error> { Ok(()) } -fn camera_loop(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<(), Error> { +fn camera_loop(camera_config: &CameraConfig, output: &mut dyn Write) -> Result { let min_backoff = Duration::from_secs(1); let max_backoff = Duration::from_secs(15); let mut current_backoff = min_backoff; loop { - match camera_main(camera_config, output) { - // Authentication failures are permanent; we retry everything else - Ok(_) => error!( - "Camera {} stream stopped unexpectedly, will retry in {}s", - camera_config.name, - current_backoff.as_secs() - ), - Err(cam_err) => { - if cam_err.connected { - current_backoff = min_backoff; - } - match cam_err.err { - neolink::Error::AuthFailed => { - error!( - "Authentication failed to camera {}, not retrying", - camera_config.name - ); - return Err(cam_err.err.into()); - } - _ => error!( - "Error streaming from camera {}, will retry in {}s: {}", - camera_config.name, - current_backoff.as_secs(), - cam_err.err - ), - } + let cam_err = camera_main(camera_config, output).unwrap_err(); + // Authentication failures are permanent; we retry everything else + if cam_err.connected { + current_backoff = min_backoff; + } + match cam_err.err { + neolink::Error::AuthFailed => { + error!( + "Authentication failed to camera {}, not retrying", + camera_config.name + ); + return Err(cam_err.err.into()); } + _ => error!( + "Error streaming from camera {}, will retry in {}s: {}", + camera_config.name, + current_backoff.as_secs(), + cam_err.err + ), } std::thread::sleep(current_backoff); @@ -86,7 +79,7 @@ fn camera_loop(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<( } } -fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<(), CameraErr> { +fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result { let mut camera = BcCamera::new_with_addr(camera_config.camera_addr).map_err(CameraErr::before_connect)?; if let Some(timeout) = camera_config.timeout { @@ -107,11 +100,7 @@ fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<( "{}: Connected to camera, starting video stream", camera_config.name ); - camera - .start_video(output) - .map_err(CameraErr::after_connect)?; - - unreachable!() + camera.start_video(output).map_err(CameraErr::after_connect) } struct CameraErr {