Merge pull request xapi-project#13 from robhoes/master

CA-112572: networkd: protect IP watcher thread with an exception handler
psafont · Jul 30, 2013 · 4aed922 · 4aed922
2 parents 0cde8e9 + abf9b51
commit 4aed922
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/networkd/network_monitor_thread.ml b/networkd/network_monitor_thread.ml
@@ -266,7 +266,6 @@ let ip_watcher () =
 	);
 	Unix.close writeme;
 	let in_channel = Unix.in_channel_of_descr readme in
-	debug "Started IP watcher thread";
 	let rec loop () =
 		let line = input_line in_channel in
 		(* Do not send events for link-local IPv6 addresses, and removed IPs *)
@@ -279,7 +278,13 @@ let ip_watcher () =
 		end;
 		loop ()
 	in
-	loop ()
+	while true do
+		try
+			info "(Re)started IP watcher thread";
+			loop ()
+		with e ->
+			warn "Error in IP watcher: %s\n%s" (Printexc.to_string e) (Printexc.get_backtrace ())
+	done
 
 let start () =
 	let dbg = "monitor_thread" in