projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net.dns: Support for resolving AAAA records
[prosody.git]
/
net
/
connlisteners.lua
diff --git
a/net/connlisteners.lua
b/net/connlisteners.lua
index 93dce8b3aecb5c179c2bb09e7ee6a41c325af6ef..7da25c62df3e4d52c7824d71432c516ff16650e1 100644
(file)
--- 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 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"
module "connlisteners"
@@
-37,7
+39,7
@@
end
function get(name)
local h = listeners[name];
if not h then
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;
if not ok then
log("error", "Error while loading listener '%s': %s", tostring(name), tostring(ret));
return nil, ret;