Mode debug prints for error code 400

This commit is contained in:
QuantumEntangledAndy committed 2024-04-28 11:38:39 +07:00
1 parent 366c2a4b69
commit e6321f36d7
19 files changed
+106 -32

No files matched your search

+4 -1
View File
@@ -30,7 +30,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+7 -2
View File
@@ -45,8 +45,13 @@ pub enum Error {
},
/// Raised when the camera responds with a status code over than OK
#[error("Camera responded with Service Unavaliable: {0}")]
CameraServiceUnavailable(u16),
#[error("Camera responded with Service Unavaliable: Msg of type {id} returned code {code}")]
CameraServiceUnavailable {
/// The message ID
id: u32,
// The return code this is usually 200 for OK and 400 for not yet ready and 500 for camera cannot comply or understand
code: u16,
},
/// Raised when the camera responds with a status code over than OK during login
#[error("Camera responded with Err during login")]
+8 -2
View File
@@ -129,7 +129,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
@@ -181,7 +184,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
Ok(())
+4 -1
View File
@@ -29,7 +29,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+4 -1
View File
@@ -27,7 +27,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+12 -3
View File
@@ -39,10 +39,16 @@ impl BcCamera {
reties += 1;
continue;
} else {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
} else if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
} else {
// Valid message with response_code == 200
if let BcBody::ModernMsg(ModernMsg {
@@ -101,7 +107,10 @@ impl BcCamera {
{
let msg = reply?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcMeta {
+4 -1
View File
@@ -317,7 +317,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+4 -1
View File
@@ -64,7 +64,10 @@ impl BcCamera {
sub.send(msg).await?;
let msg = sub.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
Ok(())
+12 -3
View File
@@ -34,7 +34,10 @@ impl BcCamera {
{
let msg = reply?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcMeta {
@@ -90,10 +93,16 @@ impl BcCamera {
reties += 1;
continue;
} else {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
} else if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
} else {
// Valid message with response_code == 200
if let BcBody::ModernMsg(ModernMsg {
+4 -1
View File
@@ -39,7 +39,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
Ok(())
+8 -2
View File
@@ -41,7 +41,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
@@ -132,7 +135,10 @@ impl BcCamera {
}
} else {
// anything else is an error
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
// let binary_stream = sub_get.payload_stream();
+8 -2
View File
@@ -255,7 +255,10 @@ impl BcCamera {
msg_id: MSG_ID_VIDEO_STOP,
..
} = msg.meta {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable{
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
}
} => v,
@@ -336,7 +339,10 @@ impl BcCamera {
let reply = sub_video.recv().await?;
if reply.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(reply.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: reply.meta.msg_id,
code: reply.meta.response_code,
});
}
Ok(())
+4 -1
View File
@@ -27,7 +27,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+4 -1
View File
@@ -26,7 +26,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+4 -1
View File
@@ -33,7 +33,10 @@ impl BcCamera {
sub_get_general.send(get).await?;
let msg = sub_get_general.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+4 -1
View File
@@ -25,7 +25,10 @@ impl BcCamera {
sub_get.send(get).await?;
let msg = sub_get.recv().await?;
if msg.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(msg.meta.response_code));
return Err(Error::CameraServiceUnavailable {
id: msg.meta.msg_id,
code: msg.meta.response_code,
});
}
if let BcBody::ModernMsg(ModernMsg {
+4 -3
View File
@@ -27,9 +27,10 @@ impl BcCamera {
let modern_reply = sub_version.recv().await?;
if modern_reply.meta.response_code != 200 {
return Err(Error::CameraServiceUnavailable(
modern_reply.meta.response_code,
));
return Err(Error::CameraServiceUnavailable {
id: modern_reply.meta.msg_id,
code: modern_reply.meta.response_code,
});
}
let version_info;
match modern_reply.body {
+5 -3
View File
@@ -120,15 +120,17 @@ impl NeoInstance {
if let Some(cam) = camera.clone() {
let cam_ref = cam.as_ref();
let mut r = Err(anyhow!("No run"));
for _ in 0..5 {
for i in 0..5 {
r = task(cam_ref).await;
if let Err(e) = &r {
log::trace!("- Task Result: {e:?}");
log::debug!("- Task Error: {e:?}");
}
if let Err(Some(neolink_core::Error::CameraServiceUnavailable(400))) = r.as_ref().map_err(|e| e.downcast_ref::<neolink_core::Error>()) {
if let Err(Some(e @ neolink_core::Error::CameraServiceUnavailable{code: 400, ..})) = r.as_ref().map_err(|e| e.downcast_ref::<neolink_core::Error>()) {
// Retryable without a reconnect
// Usually occurs when camera is starting up
// or the connection is initialising
log::debug!("Got a 400 code for {e:?} retry {i}/5, ");
sleep(Duration::from_secs(1)).await;
continue;
} else {
+2 -2
View File
@@ -458,7 +458,7 @@ async fn listen_on_camera(camera: NeoInstance, mqtt_instance: MqttInstance) -> R
}).await;
let image = match image {
Err(e) => match e.downcast::<neolink_core::Error>() {
Ok(neolink_core::Error::CameraServiceUnavailable(_)) => {
Ok(neolink_core::Error::CameraServiceUnavailable{..}) => {
log::debug!("Image not supported");
futures::future::pending().await
},
@@ -502,7 +502,7 @@ async fn listen_on_camera(camera: NeoInstance, mqtt_instance: MqttInstance) -> R
}).await;
let xml = match xml {
Err(e) => match e.downcast::<neolink_core::Error>() {
Ok(neolink_core::Error::CameraServiceUnavailable(_)) => {
Ok(neolink_core::Error::CameraServiceUnavailable{..}) => {
log::debug!("Battery not supported");
futures::future::pending().await
},