mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backed out changeset 3eea63a68e0f

Browse source 
Commit included intended changes to loggingmanager
This commit is contained in:
Matthew Wild 2019-03-26 13:51:06 +00:00
parent e1b559853f
commit de72422137
2 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/loggingmanager.lua
View file

@ -18,9 +18,6 @@ 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
@ -48,8 +45,7 @@ local function add_rule(sink_config)
local sink = sink_maker(sink_config);
-- Set sink for all chosen levels
local levels = get_levels(sink_config.levels or logging_levels);
for level in pairs(levels) do
for level in pairs(get_levels(sink_config.levels or logging_levels)) do
logger.add_level_sink(level, sink);
end
end
@ -236,21 +232,6 @@ 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;

9
util/queue.lua
View file

@ -52,15 +52,16 @@ local function new(size, allow_wrapping)
return t[tail];
end;
items = function (self)
return function (_, pos)
if pos >= items then
--luacheck: ignore 431/t
return function (t, pos)
if pos >= t:count() then
return nil;
end
local read_pos = tail + pos;
if read_pos > self.size then
if read_pos > t.size then
read_pos = (read_pos%size);
end
return pos+1, t[read_pos];
return pos+1, t._items[read_pos];
end, self, 0;
end;
consume = function (self)