diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:40:39 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:40:39 +0100 |
| commit | 088d94cf1e4c14e24a36d609ae255d51c23f3614 (patch) | |
| tree | 1f8626c471d0a192eaa46cc4ea40325a43a5469f | |
| parent | 669449342ff7f72b94149861c8dbf156d0343e1a (diff) | |
| parent | ebadd3e469bfb4dd5b4d71ba8270b3ed6a82805d (diff) | |
| download | prosody-088d94cf1e4c14e24a36d609ae255d51c23f3614.tar.gz prosody-088d94cf1e4c14e24a36d609ae255d51c23f3614.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/stanza_router.lua | 7 |
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 |