aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-10 15:27:01 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-10 15:27:01 +0000
commitfab808b050f2aff4fff6f9b565d8ab5279bf7cca (patch)
tree40b2cf3e9d2d59cd9501826f4d0df835384962a8
parent347ab4a0d99ce14c242d85e2f72f87f5161cefcb (diff)
downloadprosody-fab808b050f2aff4fff6f9b565d8ab5279bf7cca.tar.gz
prosody-fab808b050f2aff4fff6f9b565d8ab5279bf7cca.zip
Fix blank tracebacks for c2s/s2s connections
-rw-r--r--net/xmppclient_listener.lua2
-rw-r--r--net/xmppserver_listener.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index a130a0c1..fb1dcc7d 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -47,7 +47,7 @@ function stream_callbacks.error(session, error, data)
end
end
-local function handleerr(err) log("error", "Traceback[c2s]:", err, debug.traceback()); end
+local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), debug.traceback()); end
function stream_callbacks.handlestanza(a, b)
xpcall(function () core_process_stanza(a, b) end, handleerr);
end
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index b8198beb..806357e0 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -39,7 +39,7 @@ function stream_callbacks.error(session, error, data)
end
end
-local function handleerr(err) log("error", "Traceback[s2s]:", err, debug.traceback()); end
+local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
function stream_callbacks.handlestanza(a, b)
xpcall(function () core_process_stanza(a, b) end, handleerr);
end