Handle closing and upgrade message numbers and IDs more cleanly

This commit is contained in:
QuantumEntangledAndy committed 2023-06-08 13:22:54 +07:00
1 parent f7b5e89ba8
commit fbbfddaa37
2 files changed
+33 -16

No files matched your search

@@ -184,17 +184,28 @@ impl Poller {
}
}
(None, Some(occ)) => {
let sender =
if let Some(sender) = occ.get(&Some(msg_num)).cloned() {
Some(sender)
} else if let Some(sender) = occ.get(&None).cloned() {
// Upgrade a None to a known MsgID
occ.remove(&None);
occ.insert(Some(msg_num), sender.clone());
Some(sender)
} else {
None
};
let sender = if let Some(sender) =
occ.get(&Some(msg_num)).filter(|a| !a.is_closed()).cloned()
{
// Connection with id exists and is not closed
Some(sender)
} else if let Some(sender) = occ.get(&None).cloned() {
// Upgrade a None to a known MsgID
occ.remove(&None);
occ.insert(Some(msg_num), sender.clone());
Some(sender)
} else if occ
.get(&Some(msg_num))
.map(|a| a.is_closed())
.unwrap_or(false)
{
// Connection is closed and there is no None to replace it
// Remove it for cleanup and report no sender
occ.remove(&Some(msg_num));
None
} else {
None
};
if let Some(sender) = sender {
if sender.capacity() == 0 {
warn!("Reaching limit of channel");
@@ -217,6 +228,12 @@ impl Poller {
if sender.send(Ok(response)).await.is_err() {
occ.remove(&Some(msg_num));
}
} else {
debug!(
"Ignoring uninteresting message id {} (number: {})",
msg_id, msg_num
);
trace!("Contents: {:?}", response);
}
}
(None, None) => {
+5 -5
View File
@@ -57,7 +57,7 @@ impl BcCamera {
..
}) = msg.body
{
log::debug!("Got snap XML {} with size {}", filename, expected_size);
log::trace!("Got snap XML {} with size {}", filename, expected_size);
// Messages are now sent on ID 109 but not with the same message ID
// preumably because the camera considers it to be a new message rather
// than a reply
@@ -68,7 +68,7 @@ impl BcCamera {
let expected_size = expected_size as usize;
let mut result: Vec<_> = vec![];
log::debug!("Waiting for packets on {}", msg_num);
log::trace!("Waiting for packets on {}", msg_num);
let mut msg = sub_get.recv().await?;
while msg.meta.response_code == 200 {
@@ -91,7 +91,7 @@ impl BcCamera {
why: "Expected binary data but got something else",
});
}
log::debug!(
log::trace!(
"Got packet size is now {} of {}",
result.len(),
expected_size
@@ -114,7 +114,7 @@ impl BcCamera {
// Add last data if present (may be zero if preveious packet contained it)
result.extend_from_slice(&data);
}
log::debug!(
log::trace!(
"Got all packets size is now {} of {}",
result.len(),
expected_size
@@ -140,7 +140,7 @@ impl BcCamera {
// .take(expected_size)
// .try_collect()
// .await?;
log::debug!("Snapshot recieved: {} of {}", result.len(), expected_size);
log::trace!("Snapshot recieved: {} of {}", result.len(), expected_size);
Ok(result)
} else {
Err(Error::UnintelligibleReply {