projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Tobias SCRAM-PLUS work
[prosody.git]
/
core
/
loggingmanager.lua
diff --git
a/core/loggingmanager.lua
b/core/loggingmanager.lua
index c69dede85edf747d4c5f935f99fea5b06887d72a..c63611468ba2fa2343567759ffb779e5d9220831 100644
(file)
--- a/
core/loggingmanager.lua
+++ b/
core/loggingmanager.lua
@@
-1,7
+1,7
@@
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
---
+--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
@@
-48,7
+48,7
@@
local function add_rule(sink_config)
if sink_maker then
-- Create sink
local sink = sink_maker(sink_config);
if sink_maker then
-- Create sink
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
logger.add_level_sink(level, sink);
-- Set sink for all chosen levels
for level in pairs(get_levels(sink_config.levels or logging_levels)) do
logger.add_level_sink(level, sink);
@@
-63,7
+63,7
@@
end
-- the log_sink_types table.
function apply_sink_rules(sink_type)
if type(logging_config) == "table" then
-- the log_sink_types table.
function apply_sink_rules(sink_type)
if type(logging_config) == "table" then
-
+
for _, level in ipairs(logging_levels) do
if type(logging_config[level]) == "string" then
local value = logging_config[level];
for _, level in ipairs(logging_levels) do
if type(logging_config[level]) == "string" then
local value = logging_config[level];
@@
-82,7
+82,7
@@
function apply_sink_rules(sink_type)
end
end
end
end
end
end
-
+
for _, sink_config in ipairs(logging_config) do
if (type(sink_config) == "table" and sink_config.to == sink_type) then
add_rule(sink_config);
for _, sink_config in ipairs(logging_config) do
if (type(sink_config) == "table" and sink_config.to == sink_type) then
add_rule(sink_config);
@@
-128,7
+128,7
@@
function get_levels(criteria, set)
end
end
end
end
end
end
-
+
for _, level in ipairs(criteria) do
set[level] = true;
end
for _, level in ipairs(criteria) do
set[level] = true;
end
@@
-138,12
+138,12
@@
end
-- Initialize config, etc. --
function reload_logging()
local old_sink_types = {};
-- Initialize config, etc. --
function reload_logging()
local old_sink_types = {};
-
+
for name, sink_maker in pairs(log_sink_types) do
old_sink_types[name] = sink_maker;
log_sink_types[name] = nil;
end
for name, sink_maker in pairs(log_sink_types) do
old_sink_types[name] = sink_maker;
log_sink_types[name] = nil;
end
-
+
logger.reset();
local debug_mode = config.get("*", "debug");
logger.reset();
local debug_mode = config.get("*", "debug");
@@
-155,12
+155,12
@@
function reload_logging()
default_timestamp = "%b %d %H:%M:%S";
logging_config = config.get("*", "log") or default_logging;
default_timestamp = "%b %d %H:%M:%S";
logging_config = config.get("*", "log") or default_logging;
-
-
+
+
for name, sink_maker in pairs(old_sink_types) do
log_sink_types[name] = sink_maker;
end
for name, sink_maker in pairs(old_sink_types) do
log_sink_types[name] = sink_maker;
end
-
+
prosody.events.fire_event("logging-reloaded");
end
prosody.events.fire_event("logging-reloaded");
end
@@
-179,11
+179,11
@@
local sourcewidth = 20;
function log_sink_types.stdout(config)
local timestamps = config.timestamps;
function log_sink_types.stdout(config)
local timestamps = config.timestamps;
-
+
if timestamps == true then
timestamps = default_timestamp; -- Default format
end
if timestamps == true then
timestamps = default_timestamp; -- Default format
end
-
+
return function (name, level, message, ...)
sourcewidth = math_max(#name+2, sourcewidth);
local namelen = #name;
return function (name, level, message, ...)
sourcewidth = math_max(#name+2, sourcewidth);
local namelen = #name;
@@
-200,7
+200,7
@@
end
do
local do_pretty_printing = true;
do
local do_pretty_printing = true;
-
+
local logstyles = {};
if do_pretty_printing then
logstyles["info"] = getstyle("bold");
local logstyles = {};
if do_pretty_printing then
logstyles["info"] = getstyle("bold");
@@
-212,7
+212,7
@@
do
if not do_pretty_printing then
return log_sink_types.stdout(config);
end
if not do_pretty_printing then
return log_sink_types.stdout(config);
end
-
+
local timestamps = config.timestamps;
if timestamps == true then
local timestamps = config.timestamps;
if timestamps == true then
@@
-222,7
+222,7
@@
do
return function (name, level, message, ...)
sourcewidth = math_max(#name+2, sourcewidth);
local namelen = #name;
return function (name, level, message, ...)
sourcewidth = math_max(#name+2, sourcewidth);
local namelen = #name;
-
+
if timestamps then
io_write(os_date(timestamps), " ");
end
if timestamps then
io_write(os_date(timestamps), " ");
end