Skip to content

Commit 99e5192

Browse files
committed
put errors back
1 parent 2a262c0 commit 99e5192

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

trust-quorum/src/connection_manager.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
77
use crate::established_conn::EstablishedConn;
88
use trust_quorum_protocol::{BaseboardId, PeerMsg};
9-
// TODO: Move or copy this to this crate?
9+
10+
// TODO: Move to this crate
11+
// https://github.com/oxidecomputer/omicron/issues/9311
1012
use bootstore::schemes::v0::NetworkConfig;
13+
1114
use camino::Utf8PathBuf;
1215
use iddqd::{
1316
BiHashItem, BiHashMap, TriHashItem, TriHashMap, bi_upcast, tri_upcast,
@@ -446,7 +449,7 @@ impl ConnMgr {
446449
);
447450

448451
// Inform the main task that accepted connection is established
449-
if let Err(_) = main_tx.try_send(ConnToMainMsg {
452+
if let Err(e) = main_tx.try_send(ConnToMainMsg {
450453
task_id: task::id(),
451454
msg: ConnToMainMsgInner::Accepted {
452455
addr,
@@ -455,7 +458,7 @@ impl ConnMgr {
455458
}) {
456459
// The system is shutting down or we've overloaded the main channel
457460
// Just bail from this task
458-
warn!(log, "Failed to send 'accepted' msg to main task");
461+
warn!(log, "Failed to send 'accepted' msg to main task: {e}");
459462
} else {
460463
conn.run().await;
461464
}
@@ -660,7 +663,7 @@ impl ConnMgr {
660663
);
661664
// Inform the main task that the client connection is
662665
// established.
663-
if let Err(_) = main_tx.try_send(ConnToMainMsg {
666+
if let Err(e) = main_tx.try_send(ConnToMainMsg {
664667
task_id: task::id(),
665668
msg: ConnToMainMsgInner::Connected {
666669
addr,
@@ -669,7 +672,7 @@ impl ConnMgr {
669672
}) {
670673
// The system is shutting down or we've overloaded the main channel
671674
// Just bail from this task
672-
error!(log, "Failed to send 'connected' msg to main task");
675+
error!(log, "Failed to send 'connected' msg to main task: {e}");
673676
} else {
674677
conn.run().await;
675678
}

0 commit comments

Comments
 (0)