diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-23 15:14:47 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-23 15:14:47 +0100 |
| commit | 106f5079b664a9ceacb77242891e42fa7425115a (patch) | |
| tree | c9352f3197224088a16296c217e43ec770b21177 /plugins/mod_s2s | |
| parent | 5d47f4cd480305344b4fbc71c1cf942706444f31 (diff) | |
| parent | 3b59eb2735ad49245ecf539f65b9fd195a15d4c5 (diff) | |
| download | prosody-106f5079b664a9ceacb77242891e42fa7425115a.tar.gz prosody-106f5079b664a9ceacb77242891e42fa7425115a.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_s2s')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 6764e857..0ece23a6 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -429,7 +429,7 @@ function stream_callbacks.error(session, error, data) end end -local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), traceback()); end +local function handleerr(err) log("error", "Traceback[s2s]: %s", traceback(tostring(err), 2)); end function stream_callbacks.handlestanza(session, stanza) if stanza.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client stanza.attr.xmlns = nil; |