diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
| commit | 58686a0f39cea79956b747bd5bb4f091a67b9db9 (patch) | |
| tree | 9043fbad3e9e1ac74e957347fedc8cca0a635106 /plugins/mod_s2s | |
| parent | a7128214ca97a884f7d191b1fcda5202819515e5 (diff) | |
| parent | 92730073ce30a57c8a2dd673f239a7430845b2d4 (diff) | |
| download | prosody-58686a0f39cea79956b747bd5bb4f091a67b9db9.tar.gz prosody-58686a0f39cea79956b747bd5bb4f091a67b9db9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index c9b6b137..00e816f7 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -389,7 +389,7 @@ function stream_callbacks._streamopened(session, attr) elseif session.direction == "outgoing" then session.notopen = nil; if not attr.id then - log("error", "Stream response from %s did not give us a stream id!", session.to_host); + log("warn", "Stream response did not give us a stream id!"); session:close({ condition = "undefined-condition", text = "Missing stream ID" }); return; end diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 1038a616..61d6086e 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -176,6 +176,8 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err) log("debug", "DNS reply for %s gives us %s", connect_host, ip.a); IPs[#IPs+1] = new_ip(ip.a, "IPv4"); end + elseif err then + log("debug", "Error in DNS lookup: %s", err); end if have_other_result then @@ -212,6 +214,8 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err) log("debug", "DNS reply for %s gives us %s", connect_host, ip.aaaa); IPs[#IPs+1] = new_ip(ip.aaaa, "IPv6"); end + elseif err then + log("debug", "Error in DNS lookup: %s", err); end if have_other_result then |