Merge with Zash

diff --git a/net/http/server.lua b/net/http/server.lua
index 7937f87c8277e22608612b6f688ca232d43f4825..f091595cec2db7a8d3a7b1b56aaef0ee9da7ae61 100644 (file)
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -217,7 +217,7 @@ function handle_request(conn, request, finish_cb)
 
        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 --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 86689affdd12729cf036b0749928b95bbbdeadf8..610ae0aefc71a4f162c5609dec8a41e1121c2f07 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -102,6 +102,7 @@ function module.add_host(module)
                                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);