aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2019-03-26 13:51:06 +0000
committerMatthew Wild <mwild1@gmail.com>2019-03-26 13:51:06 +0000
commitde724221378ba5772c9cfdb2d40c43619da8166f (patch)
tree11c0f79986e893ea87243cf64d828f22dea01b16
parente1b559853fb0f6e0967124a135e1d380d02316d9 (diff)
downloadprosody-de724221378ba5772c9cfdb2d40c43619da8166f.tar.gz
prosody-de724221378ba5772c9cfdb2d40c43619da8166f.zip
Backed out changeset 3eea63a68e0f
Commit included intended changes to loggingmanager
-rw-r--r--core/loggingmanager.lua21
-rw-r--r--util/queue.lua9
2 files changed, 6 insertions, 24 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index b510617f..cfa8246a 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -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;
diff --git a/util/queue.lua b/util/queue.lua
index 66ed098b..e63b3f1c 100644
--- a/util/queue.lua
+++ b/util/queue.lua
@@ -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)