Diff

core/loggingmanager.lua @ 9925:8d0112413997

Backed out changeset 3eea63a68e0f Commit included intended changes to loggingmanager
author Matthew Wild <mwild1@gmail.com>
date Tue, 26 Mar 2019 13:51:06 +0000
parent 9902:3eea63a68e0f
child 9927:1460c4966262
line wrap: on
line diff
--- a/core/loggingmanager.lua	Mon Mar 25 14:37:43 2019 +0000
+++ b/core/loggingmanager.lua	Tue Mar 26 13:51:06 2019 +0000
@@ -18,9 +18,6 @@
 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 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 @@
 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;