diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/configmanager.lua | 14 | ||||
| -rw-r--r-- | core/loggingmanager.lua | 22 |
2 files changed, 34 insertions, 2 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 6b181443..87c78aee 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -137,6 +137,12 @@ do rawset(env, "__currenthost", name); -- Needs at least one setting to logically exist :) set(name or "*", "core", "defined", true); + return function (config_options) + rawset(env, "__currenthost", "*"); -- Return to global scope + for option_name, option_value in pairs(config_options) do + set(name or "*", "core", option_name, option_value); + end + end; end env.Host, env.host = env.VirtualHost, env.VirtualHost; @@ -149,11 +155,19 @@ do -- Don't load the global modules by default set(name, "core", "load_global_modules", false); rawset(env, "__currenthost", name); + local function handle_config_options(config_options) + rawset(env, "__currenthost", "*"); -- Return to global scope + for option_name, option_value in pairs(config_options) do + set(name or "*", "core", option_name, option_value); + end + end return function (module) if type(module) == "string" then set(name, "core", "component_module", module); + return handle_config_options; end + return handle_config_options(module); end end env.component = env.Component; diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index f8cba059..96cd32dc 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -89,9 +89,25 @@ end -- the log_sink_types table. function apply_sink_rules(sink_type) if type(logging_config) == "table" then + + if sink_type == "file" then + for _, level in ipairs(logging_levels) do + if type(logging_config[level]) == "string" then + add_rule({ + to = "file", + filename = logging_config[level], + timestamps = true, + levels = { min = level }, + }); + end + end + end + for _, sink_config in pairs(logging_config) do - if sink_config.to == sink_type then + if (type(sink_config) == "table" and sink_config.to == sink_type) then add_rule(sink_config); + elseif (type(sink_config) == "string" and sink_config:match("^%*(.+)") == sink_type) then + add_rule({ levels = { min = "debug" }, to = sink_type }); end end elseif type(logging_config) == "string" and (not logging_config:match("^%*")) and sink_type == "file" then @@ -151,7 +167,9 @@ function reload_logging() logger.reset(); default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } }; - default_file_logging = { { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } }; + default_file_logging = { + { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true } + }; default_timestamp = "%b %d %H:%M:%S"; logging_config = config.get("*", "core", "log") or default_logging; |