mod_admin_adhoc: Implement global module reloading

[prosody.git] / plugins / mod_s2s / s2sout.lib.lua

diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index d2c6023e65c556418fe45d2c665f15f7f964d83e..076239680f41b7d6a69f6017780672d23d9417b0 100644 (file)
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -94,15 +94,15 @@ function s2sout.attempt_connection(host_session, err)
                handle = adns.lookup(function (answer)
                        handle = nil;
                        host_session.connecting = nil;
-                       if answer then
-                               log("debug", to_host.." has SRV records, handling...");
+                       if answer and #answer > 0 then
+                               log("debug", "%s has SRV records, handling...", to_host);
                                local srv_hosts = {};
                                host_session.srv_hosts = srv_hosts;
                                for _, record in ipairs(answer) do
                                        t_insert(srv_hosts, record.srv);
                                end
                                if #srv_hosts == 1 and srv_hosts[1].target == "." then
-                                       log("debug", to_host.." does not provide a XMPP service");
+                                       log("debug", "%s does not provide a XMPP service", to_host);
                                        s2s_destroy_session(host_session, err); -- Nothing to see here
                                        return;
                                end
@@ -115,7 +115,7 @@ function s2sout.attempt_connection(host_session, err)
                                        log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port);
                                end
                        else
-                               log("debug", to_host.." has no SRV records, falling back to A/AAAA");
+                               log("debug", "%s has no SRV records, falling back to A/AAAA", to_host);
                        end
                        -- Try with SRV, or just the plain hostname if no SRV
                        local ok, err = s2sout.try_connect(host_session, connect_host, connect_port);