diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-02-18 16:46:07 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-02-18 16:46:07 +0000 |
| commit | 80952e2cc9c13df0a8a9ea572326f82285b05141 (patch) | |
| tree | 4cd0d2ec4c7c03553ce9ae55132d85802f2bced9 | |
| parent | 4aaa16aa23eb1fa887dd27e6286b05dd557054e5 (diff) | |
| parent | f2a5185e0074e220759ccc35ca897d6d948cb219 (diff) | |
| download | prosody-80952e2cc9c13df0a8a9ea572326f82285b05141.tar.gz prosody-80952e2cc9c13df0a8a9ea572326f82285b05141.zip | |
Merge with 0.7
| -rw-r--r-- | core/modulemanager.lua | 4 | ||||
| -rw-r--r-- | net/adns.lua | 14 | ||||
| -rw-r--r-- | net/server_event.lua | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 6b2260f5..1174352b 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -158,7 +158,7 @@ function load(host, module_name, config) log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil"); end if success then - hosts[host].events.fire_event("module-loaded", { module = module_name, host = host }); + (hosts[api_instance.host] or prosody).events.fire_event("module-loaded", { module = module_name, host = host }); return true; else -- load failed, unloading unload(api_instance.host, module_name); @@ -210,7 +210,7 @@ function unload(host, name, ...) end end modulemap[host][name] = nil; - hosts[host].events.fire_event("module-unloaded", { module = name, host = host }); + (hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host }); return true; end diff --git a/net/adns.lua b/net/adns.lua index d1876b0f..0121881a 100644 --- a/net/adns.lua +++ b/net/adns.lua @@ -54,13 +54,15 @@ function new_async_socket(sock, resolver) end end function listener.ondisconnect(conn, err) - log("warn", "DNS socket for %s disconnected: %s", peername, err); - local servers = resolver.server; - if resolver.socketset[conn] == resolver.best_server and resolver.best_server == #servers then - log("error", "Exhausted all %d configured DNS servers, next lookup will try %s again", #servers, servers[1]); - end + if err then + log("warn", "DNS socket for %s disconnected: %s", peername, err); + local servers = resolver.server; + if resolver.socketset[conn] == resolver.best_server and resolver.best_server == #servers then + log("error", "Exhausted all %d configured DNS servers, next lookup will try %s again", #servers, servers[1]); + end - resolver:servfail(conn); -- Let the magic commence + resolver:servfail(conn); -- Let the magic commence + end end handler = server.wrapclient(sock, "dns", 53, listener); if not handler then diff --git a/net/server_event.lua b/net/server_event.lua index 610c2e7a..3456fb9e 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -262,7 +262,7 @@ do _ = self.eventsession and self.eventsession:close( ) _ = self.eventwritetimeout and self.eventwritetimeout:close( ) _ = self.eventreadtimeout and self.eventreadtimeout:close( ) - _ = self.ondisconnect and self:ondisconnect( self.fatalerror ) -- call ondisconnect listener (wont be the case if handshake failed on connect) + _ = self.ondisconnect and self:ondisconnect( self.fatalerror ~= "client to close" and self.fatalerror) -- call ondisconnect listener (wont be the case if handshake failed on connect) _ = self.conn and self.conn:close( ) -- close connection, must also be called outside of any socket registered events! _ = self._server and self._server:counter(-1); self.eventread, self.eventwrite = nil, nil |