diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-10 16:59:21 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-10 16:59:21 +0100 |
commit | 08c9156f20fe9700913f5b97e6199b396ed6a87f (patch) | |
tree | af21ea2d626caddb6c0e6f4b50e16a21dfb2b2f8 /plugins | |
parent | b0eec64a3f56ee4020f2d328e6d51a07f45cab53 (diff) | |
parent | 384687ffa49ac61dddb91be1ec5de1572ba2c036 (diff) | |
download | prosody-08c9156f20fe9700913f5b97e6199b396ed6a87f.tar.gz prosody-08c9156f20fe9700913f5b97e6199b396ed6a87f.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_blocklist.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua index 283d52fa..6a555a06 100644 --- a/plugins/mod_blocklist.lua +++ b/plugins/mod_blocklist.lua @@ -228,8 +228,11 @@ end); -- Buggy clients module:hook("iq-error/self/blocklist-push", function (event) + local origin, stanza = event.origin, event.stanza; local _, condition, text = event.stanza:get_error(); - (event.origin.log or module._log)("warn", "Client returned an error in response to notification from mod_%s: %s%s%s", module.name, condition, text and ": " or "", text or ""); + local log = (origin.log or module._log); + log("warn", "Client returned an error in response to notification from mod_%s: %s%s%s", + module.name, condition, text and ": " or "", text or ""); return true; end); |