Software `/` code `/` prosody

Annotate

core/loggingmanager.lua @ 5877:615a0774e4cc

util.timer: Updated to use util.indexedbheap to provide a more complete API. Timers can now be stopped or rescheduled. Callbacks are now pcall'd. Adding/removing timers from within timer callbacks works better. Optional parameter can be passed when creating timer which gets passed to callback, eliminating the need for closures in various timer uses. Timers are now much more lightweight.

author	Waqas Hussain <waqas20@gmail.com>
date	Wed, 30 Oct 2013 17:44:42 -0400
parent	5776:bd0ff8ae98a8
child	6617:a455dac79f58

rev	line source
1522 569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1344 diff changeset	1 -- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2922 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2922 diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	4 --
1522 569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1344 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1344 diff changeset	6 -- COPYING file in the source package for more information.
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1344 diff changeset	7 --
569d58d21612 Add copyright header to those files missing one Matthew Wild <mwild1@gmail.com> parents: 1344 diff changeset	8
1016 73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	9
5001 78a3d275715a loggingmanager: Remove unused variables Matthew Wild <mwild1@gmail.com> parents: 4627 diff changeset	10 local format = string.format;
78a3d275715a loggingmanager: Remove unused variables Matthew Wild <mwild1@gmail.com> parents: 4627 diff changeset	11 local setmetatable, rawset, pairs, ipairs, type =
78a3d275715a loggingmanager: Remove unused variables Matthew Wild <mwild1@gmail.com> parents: 4627 diff changeset	12 setmetatable, rawset, pairs, ipairs, type;
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	13 local io_open, io_write = io.open, io.write;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	14 local math_max, rep = math.max, string.rep;
5001 78a3d275715a loggingmanager: Remove unused variables Matthew Wild <mwild1@gmail.com> parents: 4627 diff changeset	15 local os_date = os.date;
3750 e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	16 local getstyle, setstyle = require "util.termcolours".getstyle, require "util.termcolours".setstyle;
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	17
2139 625b2d3e8900 loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable is defined (workaround for MSVCRT buffering piped output). Waqas Hussain <waqas20@gmail.com> parents: 1892 diff changeset	18 if os.getenv("__FLUSH_LOG") then
625b2d3e8900 loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable is defined (workaround for MSVCRT buffering piped output). Waqas Hussain <waqas20@gmail.com> parents: 1892 diff changeset	19 local io_flush = io.flush;
625b2d3e8900 loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable is defined (workaround for MSVCRT buffering piped output). Waqas Hussain <waqas20@gmail.com> parents: 1892 diff changeset	20 local _io_write = io_write;
625b2d3e8900 loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable is defined (workaround for MSVCRT buffering piped output). Waqas Hussain <waqas20@gmail.com> parents: 1892 diff changeset	21 io_write = function(...) _io_write(...); io_flush(); end
625b2d3e8900 loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable is defined (workaround for MSVCRT buffering piped output). Waqas Hussain <waqas20@gmail.com> parents: 1892 diff changeset	22 end
625b2d3e8900 loggingmanager: Explicitly flush log messages if the __FLUSH_LOG environment variable is defined (workaround for MSVCRT buffering piped output). Waqas Hussain <waqas20@gmail.com> parents: 1892 diff changeset	23
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	24 local config = require "core.configmanager";
1016 73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	25 local logger = require "util.logger";
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	26 local prosody = prosody;
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	27
1046 6fef969ff307 core.loggingmanager: Reinstating global log() function Matthew Wild <mwild1@gmail.com> parents: 1031 diff changeset	28 _G.log = logger.init("general");
6fef969ff307 core.loggingmanager: Reinstating global log() function Matthew Wild <mwild1@gmail.com> parents: 1031 diff changeset	29
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	30 module "loggingmanager"
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	31
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	32 -- The log config used if none specified in the config file (see reload_logging for initialization)
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	33 local default_logging;
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	34 local default_file_logging;
2922 0ea2ed371fb2 loggingmanager: Don't use non-standard format specifier to format the timestamp. Waqas Hussain <waqas20@gmail.com> parents: 2139 diff changeset	35 local default_timestamp = "%b %d %H:%M:%S";
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	36 -- The actual config loggingmanager is using
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	37 local logging_config;
1016 73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	38
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	39 local apply_sink_rules;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	40 local log_sink_types = setmetatable({}, { __newindex = function (t, k, v) rawset(t, k, v); apply_sink_rules(k); end; });
1021 f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	41 local get_levels;
4427 ae71ae5ddcfc loggingmanager: Remove unused 'critical' level Matthew Wild <mwild1@gmail.com> parents: 4141 diff changeset	42 local logging_levels = { "debug", "info", "warn", "error" }
1016 73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	43
1067 21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	44 -- Put a rule into action. Requires that the sink type has already been registered.
21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	45 -- This function is called automatically when a new sink type is added [see apply_sink_rules()]
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	46 local function add_rule(sink_config)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	47 local sink_maker = log_sink_types[sink_config.to];
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	48 if sink_maker then
4627 b046cafc81a8 loggingmanager, util.logger: Remove name sinks and the ability to filter logs by source name (lots of code, hardly used if at all, and possibly broken) Matthew Wild <mwild1@gmail.com> parents: 4427 diff changeset	49 -- Create sink
b046cafc81a8 loggingmanager, util.logger: Remove name sinks and the ability to filter logs by source name (lots of code, hardly used if at all, and possibly broken) Matthew Wild <mwild1@gmail.com> parents: 4427 diff changeset	50 local sink = sink_maker(sink_config);
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	51
4627 b046cafc81a8 loggingmanager, util.logger: Remove name sinks and the ability to filter logs by source name (lots of code, hardly used if at all, and possibly broken) Matthew Wild <mwild1@gmail.com> parents: 4427 diff changeset	52 -- Set sink for all chosen levels
b046cafc81a8 loggingmanager, util.logger: Remove name sinks and the ability to filter logs by source name (lots of code, hardly used if at all, and possibly broken) Matthew Wild <mwild1@gmail.com> parents: 4427 diff changeset	53 for level in pairs(get_levels(sink_config.levels or logging_levels)) do
b046cafc81a8 loggingmanager, util.logger: Remove name sinks and the ability to filter logs by source name (lots of code, hardly used if at all, and possibly broken) Matthew Wild <mwild1@gmail.com> parents: 4427 diff changeset	54 logger.add_level_sink(level, sink);
1016 73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	55 end
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	56 else
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	57 -- No such sink type
1016 73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	58 end
73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	59 end
73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	60
1067 21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	61 -- Search for all rules using a particular sink type, and apply
21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	62 -- them. Called automatically when a new sink type is added to
21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	63 -- the log_sink_types table.
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	64 function apply_sink_rules(sink_type)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	65 if type(logging_config) == "table" then
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	66
4141 ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	67 for _, level in ipairs(logging_levels) do
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	68 if type(logging_config[level]) == "string" then
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	69 local value = logging_config[level];
5272 1e555909f23d core.loggingmanager: Don't create file log rules from [level] = "sink" style config Kim Alvefur <zash@zash.se>* parents: 5001 diff changeset	70 if sink_type == "file" and not value:match("^%*") then
3514 fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	71 add_rule({
4141 ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	72 to = sink_type;
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	73 filename = value;
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	74 timestamps = true;
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	75 levels = { min = level };
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	76 });
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	77 elseif value == "*"..sink_type then
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	78 add_rule({
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	79 to = sink_type;
ef94984c44a0 loggingmanager: Allow specifying a sink type in per-level logging config (thanks ruskie) Matthew Wild <mwild1@gmail.com> parents: 4140 diff changeset	80 levels = { min = level };
3514 fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	81 });
fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	82 end
fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	83 end
fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	84 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	85
4140 e463e1df1bda loggingmanager: Iterate over logging config rules using ipairs rather than pairs Matthew Wild <mwild1@gmail.com> parents: 4124 diff changeset	86 for _, sink_config in ipairs(logging_config) do
3514 fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	87 if (type(sink_config) == "table" and sink_config.to == sink_type) then
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	88 add_rule(sink_config);
3514 fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	89 elseif (type(sink_config) == "string" and sink_config:match("^%*(.+)") == sink_type) then
fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	90 add_rule({ levels = { min = "debug" }, to = sink_type });
1021 f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	91 end
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	92 end
1067 21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	93 elseif type(logging_config) == "string" and (not logging_config:match("^%*")) and sink_type == "file" then
2586 26ead5e16cd3 loggingmanager: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2139 diff changeset	94 -- User specified simply a filename, and the "file" sink type
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	95 -- was just added
1067 21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	96 for _, sink_config in pairs(default_file_logging) do
21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	97 sink_config.filename = logging_config;
21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	98 add_rule(sink_config);
21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	99 sink_config.filename = nil;
21f41b06f1d2 loggingmanager: Add ability to set 'log' config option to a filename, which causes all levels >= info to be logged to that file Matthew Wild <mwild1@gmail.com> parents: 1046 diff changeset	100 end
1101 fb096ca4b296 loggingmanager: Support for specifying a single sink with sinkname (syslog should now work) Matthew Wild <mwild1@gmail.com> parents: 1080 diff changeset	101 elseif type(logging_config) == "string" and logging_config:match("^%*(.+)") == sink_type then
fb096ca4b296 loggingmanager: Support for specifying a single sink with sinkname (syslog should now work) Matthew Wild <mwild1@gmail.com> parents: 1080 diff changeset	102 -- Log all levels (debug+) to this sink
fb096ca4b296 loggingmanager: Support for specifying a single sink with sinkname (syslog should now work) Matthew Wild <mwild1@gmail.com> parents: 1080 diff changeset	103 add_rule({ levels = { min = "debug" }, to = sink_type });
1021 f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	104 end
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	105 end
1016 73afe3e30e97 core.loggingmanager: A new manager (yay!) to manage log output Matthew Wild <mwild1@gmail.com> parents: diff changeset	106
1021 f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	107
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	108
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	109 --- Helper function to get a set of levels given a "criteria" table
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	110 function get_levels(criteria, set)
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	111 set = set or {};
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	112 if type(criteria) == "string" then
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	113 set[criteria] = true;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	114 return set;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	115 end
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	116 local min, max = criteria.min, criteria.max;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	117 if min or max then
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	118 local in_range;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	119 for _, level in ipairs(logging_levels) do
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	120 if min == level then
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	121 set[level] = true;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	122 in_range = true;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	123 elseif max == level then
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	124 set[level] = true;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	125 return set;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	126 elseif in_range then
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	127 set[level] = true;
2586 26ead5e16cd3 loggingmanager: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2139 diff changeset	128 end
1021 f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	129 end
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	130 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	131
1021 f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	132 for _, level in ipairs(criteria) do
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	133 set[level] = true;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	134 end
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	135 return set;
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	136 end
f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	137
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	138 -- Initialize config, etc. --
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	139 function reload_logging()
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	140 local old_sink_types = {};
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	141
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	142 for name, sink_maker in pairs(log_sink_types) do
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	143 old_sink_types[name] = sink_maker;
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	144 log_sink_types[name] = nil;
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	145 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	146
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	147 logger.reset();
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	148
5377 898454038524 core.: Complete removal of all traces of the "core" section and section-related code. Kim Alvefur <zash@zash.se>* parents: 5272 diff changeset	149 local debug_mode = config.get("*", "debug");
4123 0c9399a66b17 loggingmanager: Re-read 'debug' option on reload. Waqas Hussain <waqas20@gmail.com> parents: 4117 diff changeset	150
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	151 default_logging = { { to = "console" , levels = { min = (debug_mode and "debug") or "info" } } };
3514 fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	152 default_file_logging = {
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3514 diff changeset	153 { to = "file", levels = { min = (debug_mode and "debug") or "info" }, timestamps = true }
3514 fdae08713c67 core.loggingmanager: Logging config simplification - allow [level] = filename and sink to appear in the config table Matthew Wild <mwild1@gmail.com>* parents: 3438 diff changeset	154 };
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	155 default_timestamp = "%b %d %H:%M:%S";
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	156
5377 898454038524 core.: Complete removal of all traces of the "core" section and section-related code. Kim Alvefur <zash@zash.se>* parents: 5272 diff changeset	157 logging_config = config.get("*", "log") or default_logging;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	158
bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	159
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	160 for name, sink_maker in pairs(old_sink_types) do
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	161 log_sink_types[name] = sink_maker;
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	162 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	163
3358 b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	164 prosody.events.fire_event("logging-reloaded");
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	165 end
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	166
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	167 reload_logging();
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	168 prosody.events.add_handler("config-reloaded", reload_logging);
b5a812cf698c loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart. Matthew Wild <mwild1@gmail.com> parents: 3045 diff changeset	169
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	170 --- Definition of built-in logging sinks ---
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	171
1080 b02290fd8a75 loggingmanager: Add a comment about 'nowhere' sink type Matthew Wild <mwild1@gmail.com> parents: 1078 diff changeset	172 -- Null sink, must enter log_sink_types first
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	173 function log_sink_types.nowhere()
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	174 return function () return false; end;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	175 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	176
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	177 -- Column width for "source" (used by stdout and console)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	178 local sourcewidth = 20;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	179
4124 3761aa844d65 loggingmanager: Fix reading configuration of timestamps for console output. Waqas Hussain <waqas20@gmail.com> parents: 4123 diff changeset	180 function log_sink_types.stdout(config)
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	181 local timestamps = config.timestamps;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	182
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	183 if timestamps == true then
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	184 timestamps = default_timestamp; -- Default format
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	185 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	186
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	187 return function (name, level, message, ...)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	188 sourcewidth = math_max(#name+2, sourcewidth);
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	189 local namelen = #name;
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	190 if timestamps then
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	191 io_write(os_date(timestamps), " ");
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	192 end
2586 26ead5e16cd3 loggingmanager: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2139 diff changeset	193 if ... then
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	194 io_write(name, rep(" ", sourcewidth-namelen), level, "\t", format(message, ...), "\n");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	195 else
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	196 io_write(name, rep(" ", sourcewidth-namelen), level, "\t", message, "\n");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	197 end
2586 26ead5e16cd3 loggingmanager: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2139 diff changeset	198 end
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	199 end
1021 f9122efeaadd core.loggingmanager: Filled out most code, and cleaned up Matthew Wild <mwild1@gmail.com> parents: 1016 diff changeset	200
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	201 do
3750 e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	202 local do_pretty_printing = true;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	203
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	204 local logstyles = {};
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	205 if do_pretty_printing then
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	206 logstyles["info"] = getstyle("bold");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	207 logstyles["warn"] = getstyle("bold", "yellow");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	208 logstyles["error"] = getstyle("bold", "red");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	209 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	210 function log_sink_types.console(config)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	211 -- Really if we don't want pretty colours then just use plain stdout
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	212 if not do_pretty_printing then
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	213 return log_sink_types.stdout(config);
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	214 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	215
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	216 local timestamps = config.timestamps;
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	217
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	218 if timestamps == true then
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	219 timestamps = default_timestamp; -- Default format
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	220 end
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	221
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	222 return function (name, level, message, ...)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	223 sourcewidth = math_max(#name+2, sourcewidth);
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	224 local namelen = #name;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5377 diff changeset	225
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	226 if timestamps then
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	227 io_write(os_date(timestamps), " ");
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	228 end
3750 e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	229 io_write(name, rep(" ", sourcewidth-namelen));
e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	230 setstyle(logstyles[level]);
e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	231 io_write(level);
e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	232 setstyle();
2586 26ead5e16cd3 loggingmanager: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2139 diff changeset	233 if ... then
3750 e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	234 io_write("\t", format(message, ...), "\n");
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	235 else
3750 e076e4bf70bf core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging. Waqas Hussain <waqas20@gmail.com> parents: 3540 diff changeset	236 io_write("\t", message, "\n");
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	237 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	238 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	239 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	240 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	241
1117 360ec48ea780 loggingmanager: File log sinks react to reopen-log-files event Matthew Wild <mwild1@gmail.com> parents: 1101 diff changeset	242 local empty_function = function () end;
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	243 function log_sink_types.file(config)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	244 local log = config.filename;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	245 local logfile = io_open(log, "a+");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	246 if not logfile then
1117 360ec48ea780 loggingmanager: File log sinks react to reopen-log-files event Matthew Wild <mwild1@gmail.com> parents: 1101 diff changeset	247 return empty_function;
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	248 end
1117 360ec48ea780 loggingmanager: File log sinks react to reopen-log-files event Matthew Wild <mwild1@gmail.com> parents: 1101 diff changeset	249 local write, flush = logfile.write, logfile.flush;
360ec48ea780 loggingmanager: File log sinks react to reopen-log-files event Matthew Wild <mwild1@gmail.com> parents: 1101 diff changeset	250
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	251 local timestamps = config.timestamps;
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	252
1613 ebf0813a81f6 core.loggingmanager: Enable timestamps by default for file log sinks Matthew Wild <mwild1@gmail.com> parents: 1522 diff changeset	253 if timestamps == nil or timestamps == true then
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	254 timestamps = default_timestamp; -- Default format
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	255 end
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	256
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	257 return function (name, level, message, ...)
1078 24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	258 if timestamps then
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	259 write(logfile, os_date(timestamps), " ");
24c9ee99d900 loggingmanager: Support prepending timestamps in file/console/stdout log sinks Matthew Wild <mwild1@gmail.com> parents: 1067 diff changeset	260 end
2586 26ead5e16cd3 loggingmanager: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2139 diff changeset	261 if ... then
1031 ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	262 write(logfile, name, "\t", level, "\t", format(message, ...), "\n");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	263 else
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	264 write(logfile, name, "\t" , level, "\t", message, "\n");
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	265 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	266 flush(logfile);
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	267 end;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	268 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	269
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	270 function register_sink_type(name, sink_maker)
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	271 local old_sink_maker = log_sink_types[name];
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	272 log_sink_types[name] = sink_maker;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	273 return old_sink_maker;
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	274 end
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	275
ec013f93de81 core.loggingmanager: Refactoring, converted to a module. Now possible to register additional sink types (think syslog) from other modules Matthew Wild <mwild1@gmail.com> parents: 1024 diff changeset	276 return _M;

prosody

615a0774e4cc

core/loggingmanager.lua

Software / code / prosody

Annotate

core/loggingmanager.lua @ 5877:615a0774e4cc

Software `/` code `/` prosody