grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed obsolete warnings

Browse Source
This commit is contained in:
arkpar 2016-01-22 01:27:51 +01:00
parent d431854421
commit 81bb86d0ed
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/src/io/service.rs
View File

@ -313,7 +313,7 @@ impl<Message> IoService<Message> where Message: Send + Sync + Clone + 'static {
impl<Message> Drop for IoService<Message> where Message: Send + Sync + Clone { impl<Message> Drop for IoService<Message> where Message: Send + Sync + Clone {
fn drop(&mut self) { fn drop(&mut self) {
self.host_channel.send(IoMessage::Shutdown).unwrap(); self.host_channel.send(IoMessage::Shutdown).unwrap();
self.thread.take().unwrap().join().unwrap(); self.thread.take().unwrap().join().ok();
} }
} }

2
util/src/io/worker.rs
View File

@ -99,6 +99,6 @@ impl Drop for Worker {
self.deleting.store(true, AtomicOrdering::Relaxed); self.deleting.store(true, AtomicOrdering::Relaxed);
self.wait.notify_all(); self.wait.notify_all();
let thread = mem::replace(&mut self.thread, None).unwrap(); let thread = mem::replace(&mut self.thread, None).unwrap();
thread.join().unwrap(); thread.join().ok();
} }
} }

4
util/src/network/host.rs
View File

@ -438,7 +438,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
io.update_registration(token).unwrap_or_else(|e| debug!(target: "net", "Session registration error: {:?}", e)); 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 { if kill {
self.kill_connection(token, io); //TODO: mark connection as dead an check in kill_connection self.kill_connection(token, io); //TODO: mark connection as dead an check in kill_connection
return; return;
@ -498,8 +498,6 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
} }
} }
} }
} else {
warn!(target: "net", "Received event for unknown connection");
} }
if kill { if kill {
self.kill_connection(token, io); //TODO: mark connection as dead an check in kill_connection self.kill_connection(token, io); //TODO: mark connection as dead an check in kill_connection