Handle errors when starting parity (#1451)

This commit is contained in:
Tomasz Drwięga 2016-06-27 16:00:16 +02:00 committed by arkpar
parent 33dfb819f0
commit ac9e6f2649

View File

@ -110,7 +110,17 @@ impl Server {
// Spawn a thread with event loop // Spawn a thread with event loop
let handle = thread::spawn(move || { let handle = thread::spawn(move || {
ph.catch_panic(move || { ph.catch_panic(move || {
ws.listen(addr).unwrap() match ws.listen(addr).map_err(ServerError::from) {
Err(ServerError::IoError(io)) => die(format!(
"Signer: Could not start listening on specified address. Make sure that no other instance is running on Signer's port. Details: {:?}",
io
)),
Err(any_error) => die(format!(
"Signer: Unknown error occured when starting Signer. Details: {:?}",
any_error
)),
Ok(server) => server,
}
}).unwrap() }).unwrap()
}); });
@ -123,7 +133,11 @@ impl Server {
// TODO [ToDr] Some better structure here for messages. // TODO [ToDr] Some better structure here for messages.
broadcaster.send("new_message").unwrap(); broadcaster.send("new_message").unwrap();
}).expect("It's the only place we are running start_listening. It shouldn't fail."); }).expect("It's the only place we are running start_listening. It shouldn't fail.");
broadcaster.shutdown().expect("Broadcaster should close gently.") let res = broadcaster.shutdown();
if let Err(e) = res {
warn!("Signer: Broadcaster was not closed cleanly. Details: {:?}", e);
}
}).unwrap() }).unwrap()
}); });
@ -148,5 +162,11 @@ impl Drop for Server {
self.queue.finish(); self.queue.finish();
self.broadcaster_handle.take().unwrap().join().unwrap(); self.broadcaster_handle.take().unwrap().join().unwrap();
self.handle.take().unwrap().join().unwrap(); self.handle.take().unwrap().join().unwrap();
} }
} }
fn die(msg: String) -> ! {
println!("ERROR: {}", msg);
std::process::exit(1);
}