# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1427119555 0
# Node ID 828f9f3bdbcff9842d30946ac8e474fa54730426
# Parent  141afe8a167bd2f14383ada3a1aff60f6513c1d8# Parent  7726b627c3eaf7f049b1553cccf061db110f0bfe
Merge with Zash

diff -r 141afe8a167b -r 828f9f3bdbcf net/http/server.lua
--- a/net/http/server.lua	Mon Mar 23 14:27:30 2015 +0100
+++ b/net/http/server.lua	Mon Mar 23 14:05:55 2015 +0000
@@ -217,7 +217,7 @@
 
 	local event = request.method.." "..host..request.path:match("[^?]*");
 	local payload = { request = request, response = response };
-	--log("debug", "Firing event: %s", event);
+	log("debug", "Firing event: %s", event);
 	local result = events.fire_event(event, payload);
 	if result ~= nil then
 		if result ~= true then
diff -r 141afe8a167b -r 828f9f3bdbcf plugins/mod_http.lua
--- a/plugins/mod_http.lua	Mon Mar 23 14:27:30 2015 +0100
+++ b/plugins/mod_http.lua	Mon Mar 23 14:05:55 2015 +0000
@@ -102,6 +102,7 @@
 				end
 				if not app_handlers[event_name] then
 					app_handlers[event_name] = handler;
+					module:log("debug", "Adding app '%s' to handle %s", app_name, event_name);
 					module:hook_object_event(server, event_name, handler);
 				else
 					module:log("warn", "App %s added handler twice for '%s', ignoring", app_name, event_name);