Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

make a panic a error! and improve logging

Browse Source
This commit is contained in:
Marcel Märtens 2021-04-03 16:58:09 +02:00
parent 0f31bc6da0
commit 7010a06823
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
network/src/api.rs
View File

@ -476,9 +476,9 @@ impl Network {
} }
trace!("Participants have shut down - next: Scheduler"); trace!("Participants have shut down - next: Scheduler");
shutdown_scheduler_s if let Err(()) = shutdown_scheduler_s.send(()) {
.send(()) error!("Scheduler is closed, but nobody other should be able to close it")
.expect("Scheduler is closed, but nobody other should be able to close it"); };
if let Ok(return_s) = return_s { if let Ok(return_s) = return_s {
if return_s.send(()).is_err() { if return_s.send(()).is_err() {
warn!("Network::drop stoped after a timeout and didn't wait for our shutdown"); warn!("Network::drop stoped after a timeout and didn't wait for our shutdown");
@ -1041,7 +1041,7 @@ impl core::cmp::PartialEq for Participant {
} }
} }
fn actively_wait<T, F>(mut finished_receiver: oneshot::Receiver<T>, f: F) fn actively_wait<T, F>(name: &'static str, mut finished_receiver: oneshot::Receiver<T>, f: F)
where where
F: FnOnce(T) + Send + 'static, F: FnOnce(T) + Send + 'static,
T: Send + 'static, T: Send + 'static,
@ -1055,7 +1055,7 @@ where
handle.spawn(async move { handle.spawn(async move {
match finished_receiver.await { match finished_receiver.await {
Ok(data) => f(data), Ok(data) => f(data),
Err(e) => panic!("{}: {}", CHANNEL_ERR, e), Err(e) => panic!("{}{}: {}", name, CHANNEL_ERR, e),
} }
}); });
} else { } else {
@ -1067,7 +1067,7 @@ where
f(data); f(data);
break; break;
}, },
Err(TryRecvError::Closed) => panic!("{}", CHANNEL_ERR), Err(TryRecvError::Closed) => panic!("{}{}", name, CHANNEL_ERR),
Err(TryRecvError::Empty) => { Err(TryRecvError::Empty) => {
trace!("activly sleeping"); trace!("activly sleeping");
cnt += 1; cnt += 1;
@ -1094,7 +1094,9 @@ impl Drop for Network {
.send(finished_sender) .send(finished_sender)
{ {
Err(e) => warn!(?e, "Runtime seems to be dropped already"), Err(e) => warn!(?e, "Runtime seems to be dropped already"),
Ok(()) => actively_wait(finished_receiver, |()| info!("Network dropped gracefully")), Ok(()) => actively_wait("network", finished_receiver, |()| {
info!("Network dropped gracefully")
}),
}; };
} }
} }
@ -1123,7 +1125,7 @@ impl Drop for Participant {
{ {
Err(e) => warn!(?e, SCHEDULER_ERR), Err(e) => warn!(?e, SCHEDULER_ERR),
Ok(()) => { Ok(()) => {
actively_wait(finished_receiver, |d| match d { actively_wait("participant", finished_receiver, |d| match d {
Ok(()) => info!("Participant dropped gracefully"), Ok(()) => info!("Participant dropped gracefully"),
Err(e) => error!(?e, SHUTDOWN_ERR), Err(e) => error!(?e, SHUTDOWN_ERR),
}); });

2
network/src/participant.rs
View File

@ -199,7 +199,7 @@ impl BParticipant {
} }
// check for tcp // check for tcp
if network_protocol::TcpSendProtocol::<crate::channel::TcpDrain>::supported_promises() if network_protocol::TcpSendProtocol::<crate::channel::TcpDrain>::supported_promises()
== promises .contains(promises)
{ {
for (cid, p) in all.data.iter() { for (cid, p) in all.data.iter() {
if matches!(p, SendProtocols::Tcp(_)) { if matches!(p, SendProtocols::Tcp(_)) {