diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-10 16:29:19 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-10 16:29:19 +0100 |
| commit | 3bbc4e33918539c38c8266cffd0495c68fcbebf6 (patch) | |
| tree | e7f84ad442da82e00b4b1ac874e85e01043bbe57 /net | |
| parent | c4d2deffc64a4d955e52d7e8b2dce3af444872c7 (diff) | |
| parent | eea12d2279cd8f1e41c9234430e961754be6ce76 (diff) | |
| download | prosody-3bbc4e33918539c38c8266cffd0495c68fcbebf6.tar.gz prosody-3bbc4e33918539c38c8266cffd0495c68fcbebf6.zip | |
Merging.
Diffstat (limited to 'net')
| -rw-r--r-- | net/xmppclient_listener.lua | 2 | ||||
| -rw-r--r-- | net/xmppserver_listener.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index 64747bc5..ca4cbbb0 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -62,7 +62,7 @@ function xmppclient.listener(conn, data) -- (I'm on a mission, no time to fix now) -- Debug version -- - local function handleerr() print("Traceback:", debug.traceback()); end + local function handleerr(err) print("Traceback:", err, debug.traceback()); end session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end -- session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index f8b5d1c8..ee3faa8f 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -64,7 +64,7 @@ function xmppserver.listener(conn, data) -- (I'm on a mission, no time to fix now) -- Debug version -- - local function handleerr() print("Traceback:", debug.traceback()); end + local function handleerr(err) print("Traceback:", err, debug.traceback()); end session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end -- session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end |