diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-25 01:37:13 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-25 01:37:13 +0000 |
| commit | 449e72c7363f6bb316ba516e20a79d01f8b2a558 (patch) | |
| tree | 4e99a91122be3df0e1d74e02791b9fd0fdc68087 /net/connlisteners.lua | |
| parent | 1f5c712bcd35210ccc29e821ad367d38c8e53d1e (diff) | |
| parent | 385317309cf0ebbeddc6ebdfe7daa69a73e8f79c (diff) | |
| download | prosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.tar.gz prosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.zip | |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'net/connlisteners.lua')
| -rw-r--r-- | net/connlisteners.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/connlisteners.lua b/net/connlisteners.lua index 8c9b163f..f027dfeb 100644 --- a/net/connlisteners.lua +++ b/net/connlisteners.lua @@ -47,7 +47,8 @@ end function get(name) local h = listeners[name]; if not h then - pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua"); + local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua"); + if not ok then return nil, ret; end h = listeners[name]; end return h; |