Software / code / prosody
Changeset
7313:316ca5c15255
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 23 Mar 2016 12:19:23 +0000 |
| parents | 7310:66873c5e2061 (current diff) 7312:b4e99602ae75 (diff) |
| children | 7316:62d533535334 |
| files | prosodyctl |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Mon Mar 21 21:05:15 2016 +0000 +++ b/prosodyctl Wed Mar 23 12:19:23 2016 +0000 @@ -1063,11 +1063,15 @@ local v6_supported = not not socket.tcp6; - for host, host_options in enabled_hosts() do + for jid, host_options in enabled_hosts() do local all_targets_ok, some_targets_ok = true, false; + local node, host = jid_split(jid); local is_component = not not host_options.component_module; - print("Checking DNS for "..(is_component and "component" or "host").." "..host.."..."); + print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."..."); + if node then + print("Only the domain part ("..host..") is used in DNS.") + end local target_hosts = set.new(); if not is_component then local res = dns.lookup("_xmpp-client._tcp."..idna.to_ascii(host)..".", "SRV");
--- a/util/sql.lua Mon Mar 21 21:05:15 2016 +0000 +++ b/util/sql.lua Wed Mar 23 12:19:23 2016 +0000 @@ -328,7 +328,7 @@ local ok, actual_charset = self:transaction(function () return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'"; end); - local charset_ok; + local charset_ok = true; for row in actual_charset do if row[2] ~= charset then log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset);
