# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1263137196 0
# Node ID 1ab73691b58e95fa49d49b4dc69f4452cf0ecda0
# Parent  4403d447378308e04370819e2f4a74944d9af0e4
net.server: When libevent backend is in use, override signal.signal to use server.hook_signal

diff -r 4403d4473783 -r 1ab73691b58e net/server.lua
--- a/net/server.lua	Sun Jan 10 15:25:19 2010 +0000
+++ b/net/server.lua	Sun Jan 10 15:26:36 2010 +0000
@@ -23,6 +23,23 @@
 	function server.addtimer(f)
 		return add_task(1, function (...) f(...); return 1; end);
 	end
+	
+	-- Overwrite signal.signal() because we need to ask libevent to
+	-- handle them instead
+	local ok, signal = pcall(require, "util.signal");
+	if ok and signal then
+		local _signal_signal = signal.signal;
+		function signal.signal(signal_id, handler)
+			if type(signal_id) == "string" then
+				signal_id = signal[signal_id:upper()];
+			end
+			if type(signal_id) ~= "number" then
+				return false, "invalid-signal";
+			end
+			--_signal_signal(signal_id, handler);
+			return server.hook_signal(signal_id, handler);
+		end
+	end
 else
 	server = require "net.server_select";
 	package.loaded["net.server"] = server;