diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-07-28 19:17:09 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-07-28 19:17:09 +0100 |
| commit | 5dfe9cf891dc5becd805dfbad79653d9eb840001 (patch) | |
| tree | f64c675fbbac1f4acbcc959d820ddba16fd57a06 /core | |
| parent | 39e1b4b1df2c49739e89b80f4b4351a4e6b20f81 (diff) | |
| parent | 8ad65c2824d2ee3bd52175df34fdd7bd9d393231 (diff) | |
| download | prosody-5dfe9cf891dc5becd805dfbad79653d9eb840001.tar.gz prosody-5dfe9cf891dc5becd805dfbad79653d9eb840001.zip | |
Merge with 0.5
Diffstat (limited to 'core')
| -rw-r--r-- | core/configmanager.lua | 1 | ||||
| -rw-r--r-- | core/hostmanager.lua | 5 | ||||
| -rw-r--r-- | core/loggingmanager.lua | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 7fc6aa13..b7ee605f 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -113,6 +113,7 @@ do set(env.__currenthost or "*", "core", k, v); end}); + rawset(env, "__currenthost", "*") -- Default is global function env.Host(name) rawset(env, "__currenthost", name); -- Needs at least one setting to logically exist :) diff --git a/core/hostmanager.lua b/core/hostmanager.lua index c7b975d1..ba363273 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -41,6 +41,11 @@ function activate(host, host_config) or (configmanager.get(host, "core", "anonymous_login") and (configmanager.get(host, "core", "disallow_s2s") ~= false)) }; + for option_name in pairs(host_config.core) do + if option_name:match("_ports$") then + log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in global Host \"*\" instead", host, option_name); + end + end log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host); eventmanager.fire_event("host-activated", host, host_config); end diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index 1d2f8d7d..d701511e 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -222,7 +222,7 @@ function log_sink_types.file(config) local timestamps = config.timestamps; - if timestamps == true then + if timestamps == nil or timestamps == true then timestamps = default_timestamp; -- Default format end |