Mercurial > prosody-hg

comparison core/hostmanager.lua @ 8253:3a6f5b0f56f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 21 Sep 2017 02:36:28 +0200
parents fa6cd0e9105d cb2d86f4b511
children 4f0f5b49bb03
comparison
equal deleted inserted replaced
8246:ea2667fc6781 8253:3a6f5b0f56f0
89 host_session.sessions = {}; 89 host_session.sessions = {};
90 else -- component 90 else -- component
91 host_session.type = "component"; 91 host_session.type = "component";
92 end 92 end
93 hosts[host] = host_session; 93 hosts[host] = host_session;
94 if not host:match("[@/]") then 94 if not host_config.disco_hidden and not host:match("[@/]") then
95 disco_items:set(host:match("%.(.*)") or "*", host, host_config.name or true); 95 disco_items:set(host:match("%.(.*)") or "*", host, host_config.name or true);
96 end 96 end
97 for option_name in pairs(host_config) do 97 for option_name in pairs(host_config) do
98 if option_name:match("_ports$") or option_name:match("_interface$") then 98 if option_name:match("_ports$") or option_name:match("_interface$") then
99 log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name); 99 log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in the server-wide section instead", host, option_name);