diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-03-23 14:05:55 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-03-23 14:05:55 +0000 |
| commit | 9168d7b0898104a0dd5cc3df37a7108e2aebb425 (patch) | |
| tree | 3deb82b8ac4f9898ab821678e36a3848f3e3a2db | |
| parent | b9f798f83a4dd10e44ccb2e6fa680f3911e67764 (diff) | |
| parent | 45016aef3587db22807791ad0be11d02847c496c (diff) | |
| download | prosody-9168d7b0898104a0dd5cc3df37a7108e2aebb425.tar.gz prosody-9168d7b0898104a0dd5cc3df37a7108e2aebb425.zip | |
Merge with Zash
| -rw-r--r-- | net/http/server.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_http.lua | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/http/server.lua b/net/http/server.lua index 7937f87c..f091595c 100644 --- 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 86689aff..610ae0ae 100644 --- 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); |