diff options
author | Matthew Wild <mwild1@gmail.com> | 2019-03-23 08:52:57 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2019-03-23 08:52:57 +0000 |
commit | bd52e2269b0fff09fc8aea6c6807a9f08727bb31 (patch) | |
tree | c1d72c0e25c39c1a1f62f34a815453b20565f677 /core | |
parent | 2080433daf5a956d0456c6ce24ce1ef9183a023e (diff) | |
download | prosody-bd52e2269b0fff09fc8aea6c6807a9f08727bb31.tar.gz prosody-bd52e2269b0fff09fc8aea6c6807a9f08727bb31.zip |
util.queue: Update :items() to consistently use private data directly
It will perform better this way, and we were accessing private variables
already within the iterator.
Diffstat (limited to 'core')
-rw-r--r-- | core/loggingmanager.lua | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index cfa8246a..b510617f 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -18,6 +18,9 @@ local getstyle, getstring = require "util.termcolours".getstyle, require "util.t local config = require "core.configmanager"; local logger = require "util.logger"; +local have_pposix, pposix = pcall(require, "util.pposix"); +have_pposix = have_pposix and pposix._VERSION == "0.4.4"; + local _ENV = nil; -- luacheck: std none @@ -45,7 +48,8 @@ local function add_rule(sink_config) local sink = sink_maker(sink_config); -- Set sink for all chosen levels - for level in pairs(get_levels(sink_config.levels or logging_levels)) do + local levels = get_levels(sink_config.levels or logging_levels); + for level in pairs(levels) do logger.add_level_sink(level, sink); end end @@ -232,6 +236,21 @@ local function log_to_console(sink_config) end log_sink_types.console = log_to_console; +if have_pposix then + local syslog_opened; + local function log_to_syslog(sink_config) -- luacheck: ignore 212/sink_config + if not syslog_opened then + pposix.syslog_open(sink_config.syslog_name or "prosody", sink_config.syslog_facility or config.get("*", "syslog_facility")); + syslog_opened = true; + end + local syslog = pposix.syslog_log; + return function (name, level, message, ...) + syslog(level, name, format(message, ...)); + end; + end + log_sink_types.syslog = log_to_syslog; +end + local function register_sink_type(name, sink_maker) local old_sink_maker = log_sink_types[name]; log_sink_types[name] = sink_maker; |