diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2011-03-02 05:15:54 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2011-03-02 05:15:54 +0500 |
| commit | 7f91aa41c7a34cf3c516666b2137996327361550 (patch) | |
| tree | 397f7f3f8691fc18674914123a2e1e39da7647a1 /net | |
| parent | ac2adeb1ada41f343aeb340ac5894b41d3e10162 (diff) | |
| parent | 5ef073957a08aeb1874b0900d1e4fd603b2a1513 (diff) | |
| download | prosody-7f91aa41c7a34cf3c516666b2137996327361550.tar.gz prosody-7f91aa41c7a34cf3c516666b2137996327361550.zip | |
Merge 0.8->trunk.
Diffstat (limited to 'net')
| -rw-r--r-- | net/connlisteners.lua | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/connlisteners.lua b/net/connlisteners.lua index e13f85de..7da25c62 100644 --- a/net/connlisteners.lua +++ b/net/connlisteners.lua @@ -13,8 +13,10 @@ local server = require "net.server"; local log = require "util.logger".init("connlisteners"); local tostring = tostring; -local dofile, pcall, error = - dofile, pcall, error +local dofile, xpcall, error = + dofile, xpcall, error + +local debug_traceback = debug.traceback; module "connlisteners" @@ -37,7 +39,7 @@ end function get(name) local h = listeners[name]; if not h then - local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua"); + local ok, ret = xpcall(function() dofile(listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua") end, debug_traceback); if not ok then log("error", "Error while loading listener '%s': %s", tostring(name), tostring(ret)); return nil, ret; |