aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-08-31 16:40:39 +0100
committerMatthew Wild <mwild1@gmail.com>2016-08-31 16:40:39 +0100
commit0bad074e8621bf2537f597c0ea45718dbddd8f12 (patch)
tree1f8626c471d0a192eaa46cc4ea40325a43a5469f
parent37913e5ce81c5e0b404aa2389102e0a30b00c111 (diff)
parentce1271df1d153a41fb7a063e983dd51ab9226ebb (diff)
downloadprosody-0bad074e8621bf2537f597c0ea45718dbddd8f12.tar.gz
prosody-0bad074e8621bf2537f597c0ea45718dbddd8f12.zip
Merge 0.10->trunk
-rw-r--r--core/stanza_router.lua7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index fb30eef5..cf098258 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -36,7 +36,12 @@ local function handle_unhandled_stanza(host, origin, stanza) --luacheck: ignore
-- A normal stanza
local st_type = stanza.attr.type;
if st_type == "error" or (name == "iq" and st_type == "result") then
- log("debug", "Discarding %s from %s of type: %s", name, origin_type, st_type or '<nil>');
+ if st_type == "error" then
+ local err_type, err_condition, err_message = stanza:get_error();
+ log("debug", "Discarding unhandled error %s (%s, %s) from %s: %s", name, err_type, err_condition or "unknown condition", origin_type, stanza:top_tag());
+ else
+ log("debug", "Discarding %s from %s of type: %s", name, origin_type, st_type or '<nil>');
+ end
return;
end
if name == "iq" and (st_type == "get" or st_type == "set") and stanza.tags[1] then