diff --git a/util/src/io/service.rs b/util/src/io/service.rs index 7df064794..6daaf8cc6 100644 --- a/util/src/io/service.rs +++ b/util/src/io/service.rs @@ -313,7 +313,7 @@ impl IoService where Message: Send + Sync + Clone + 'static { impl Drop for IoService where Message: Send + Sync + Clone { fn drop(&mut self) { self.host_channel.send(IoMessage::Shutdown).unwrap(); - self.thread.take().unwrap().join().unwrap(); + self.thread.take().unwrap().join().ok(); } } diff --git a/util/src/io/worker.rs b/util/src/io/worker.rs index 8527b245a..d4418afe0 100644 --- a/util/src/io/worker.rs +++ b/util/src/io/worker.rs @@ -99,6 +99,6 @@ impl Drop for Worker { self.deleting.store(true, AtomicOrdering::Relaxed); self.wait.notify_all(); let thread = mem::replace(&mut self.thread, None).unwrap(); - thread.join().unwrap(); + thread.join().ok(); } } diff --git a/util/src/network/host.rs b/util/src/network/host.rs index 55ade8090..9203e73b6 100644 --- a/util/src/network/host.rs +++ b/util/src/network/host.rs @@ -438,7 +438,7 @@ impl Host where Message: Send + Sync + Clone { io.update_registration(token).unwrap_or_else(|e| debug!(target: "net", "Session registration error: {:?}", e)); } } - } else { warn!(target: "net", "Received event for unknown connection") } + } if kill { self.kill_connection(token, io); //TODO: mark connection as dead an check in kill_connection return; @@ -498,9 +498,7 @@ impl Host where Message: Send + Sync + Clone { } } } - } else { - warn!(target: "net", "Received event for unknown connection"); - } + } if kill { self.kill_connection(token, io); //TODO: mark connection as dead an check in kill_connection return;