Mercurial > prosody-hg
diff core/configmanager.lua @ 7950:f91e7ec9654e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 06 Mar 2017 01:14:32 +0100 |
| parents | 24170d74b00b |
| children | c22d5680ca68 |
line wrap: on
line diff
--- a/core/configmanager.lua Fri Mar 03 11:52:22 2017 +0100 +++ b/core/configmanager.lua Mon Mar 06 01:14:32 2017 +0100 @@ -158,7 +158,8 @@ function env.Component(name) name = nameprep(name); - if rawget(config_table, name) and rawget(config_table[name], "defined") and not rawget(config_table[name], "component_module") then + if rawget(config_table, name) and rawget(config_table[name], "defined") + and not rawget(config_table[name], "component_module") then error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s", name, name, name), 0); end