From 3803bc02ab14816c7dd1187f47652f171f28d72c Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 29 Oct 2020 12:57:39 +0700 Subject: [PATCH 1/2] Add error messages when deser fails --- src/bc_protocol/connection.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 7003b6a..935ac91 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -55,7 +55,15 @@ impl BcConnection { let rx_thread = std::thread::spawn(move || { let mut context = BcContext::new(); - while BcConnection::poll(&mut context, &conn, &mut subs).is_ok() {} + while { + match BcConnection::poll(&mut context, &conn, &mut subs) { + Ok(_) => true, + Err(err) => { + error!("Deserialization error: {}", err); + false + } + } + } {} }); Ok(BcConnection { From 782a9f7c4c98fec0d5a9312861b2749bbb2ae39a Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 29 Oct 2020 13:11:21 +0700 Subject: [PATCH 2/2] Handle timeout and dissconnect error differently --- src/bc_protocol.rs | 15 ++++++++++++--- src/bc_protocol/connection.rs | 2 +- src/bc_protocol/media_packet.rs | 8 +------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 640f24b..62a6f89 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -47,10 +47,10 @@ pub enum Error { DroppedConnection(#[error(source)] std::sync::mpsc::RecvError), #[error(display = "Timeout")] - Timeout(#[error(source)] std::sync::mpsc::RecvTimeoutError), + Timeout, - #[error(display = "Media")] - MediaPacket(#[error(source)] self::media_packet::Error), + #[error(display = "Dropped connection")] + TimeoutDisconnected, #[error(display = "Credential error")] AuthFailed, @@ -59,6 +59,15 @@ pub enum Error { Other(&'static str), } +impl<'a> From for Error { + fn from(k: std::sync::mpsc::RecvTimeoutError) -> Self { + match k { + std::sync::mpsc::RecvTimeoutError::Timeout => Error::Timeout, + std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDisconnected, + } + } +} + impl Drop for BcCamera { fn drop(&mut self) { self.disconnect(); diff --git a/src/bc_protocol/connection.rs b/src/bc_protocol/connection.rs index 935ac91..94defc2 100644 --- a/src/bc_protocol/connection.rs +++ b/src/bc_protocol/connection.rs @@ -59,7 +59,7 @@ impl BcConnection { match BcConnection::poll(&mut context, &conn, &mut subs) { Ok(_) => true, Err(err) => { - error!("Deserialization error: {}", err); + error!("Deserialization error: {:?}", err); false } } diff --git a/src/bc_protocol/media_packet.rs b/src/bc_protocol/media_packet.rs index 3d4689b..d458c61 100644 --- a/src/bc_protocol/media_packet.rs +++ b/src/bc_protocol/media_packet.rs @@ -1,6 +1,6 @@ use crate::bc::model::*; use crate::bc_protocol::connection::BcSubscription; -use err_derive::Error; +use crate::Error; use log::trace; use log::*; use std::collections::VecDeque; @@ -17,12 +17,6 @@ const PAD_SIZE: usize = 8; type Result = std::result::Result; -#[derive(Debug, Error)] -pub enum Error { - #[error(display = "Timeout")] - Timeout(#[error(source)] std::sync::mpsc::RecvTimeoutError), -} - #[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)] pub enum MediaDataKind { VideoDataIframe,