From 1fdbfa14adfa4c80888fb58ce0f41c42efb846db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Mon, 27 Jun 2016 16:00:16 +0200
Subject: [PATCH] Handle errors when starting parity (#1451)

---
 signer/src/ws_server/mod.rs | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/signer/src/ws_server/mod.rs b/signer/src/ws_server/mod.rs
index b6b7c15f7..d2d838b2c 100644
--- a/signer/src/ws_server/mod.rs
+++ b/signer/src/ws_server/mod.rs
@@ -110,7 +110,17 @@ impl Server {
 		// Spawn a thread with event loop
 		let handle = thread::spawn(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()
 		});
 
@@ -123,7 +133,11 @@ impl Server {
 					// TODO [ToDr] Some better structure here for messages.
 					broadcaster.send("new_message").unwrap();
 				}).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()
 		});
 
@@ -148,5 +162,11 @@ impl Drop for Server {
 		self.queue.finish();
 		self.broadcaster_handle.take().unwrap().join().unwrap();
 		self.handle.take().unwrap().join().unwrap();
+
 	}
 }
+
+fn die(msg: String) -> ! {
+	println!("ERROR: {}", msg);
+	std::process::exit(1);
+}