prosody
3965662ae091
util/logger.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

util/logger.lua @ 6774:3965662ae091

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Mon, 10 Aug 2015 22:16:05 +0200
parent 5776:bd0ff8ae98a8
child 6777:5de6b93d0190
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1523
841d61be198f Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents: 1020
diff changeset
1 -- Prosody IM
2923
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
3 -- Copyright (C) 2008-2010 Waqas Hussain
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 4937
diff changeset
4 --
758
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 716
diff changeset
5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 716
diff changeset
6 -- COPYING file in the source package for more information.
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 437
diff changeset
7 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 437
diff changeset
8
582
8eb45a8099c4 Make it possible to set custom output handler for logger
Matthew Wild <mwild1@gmail.com>
parents: 519
diff changeset
9 local pcall = pcall;
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 259
diff changeset
10
884
5758c39285ab util.logger: Small code tidying :)
Matthew Wild <mwild1@gmail.com>
parents: 883
diff changeset
11 local find = string.find;
1015
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
12 local ipairs, pairs, setmetatable = ipairs, pairs, setmetatable;
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 259
diff changeset
13
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14 module "logger"
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15
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: 3556
diff changeset
16 local level_sinks = {};
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 259
diff changeset
17
1015
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
18 local make_logger;
582
8eb45a8099c4 Make it possible to set custom output handler for logger
Matthew Wild <mwild1@gmail.com>
parents: 519
diff changeset
19
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
20 function init(name)
1015
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
21 local log_debug = make_logger(name, "debug");
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
22 local log_info = make_logger(name, "info");
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
23 local log_warn = make_logger(name, "warn");
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
24 local log_error = make_logger(name, "error");
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
25
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
26 return function (level, message, ...)
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
27 if level == "debug" then
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
28 return log_debug(message, ...);
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
29 elseif level == "info" then
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
30 return log_info(message, ...);
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
31 elseif level == "warn" then
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
32 return log_warn(message, ...);
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
33 elseif level == "error" then
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
34 return log_error(message, ...);
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
35 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
36 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
37 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
38
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
39 function make_logger(source_name, level)
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
40 local level_handlers = level_sinks[level];
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
41 if not level_handlers then
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
42 level_handlers = {};
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
43 level_sinks[level] = level_handlers;
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
44 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
45
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
46 local logger = function (message, ...)
3554
1770f8aaf04a util.logger: Remove my precious premature optimisation :(
Matthew Wild <mwild1@gmail.com>
parents: 3540
diff changeset
47 for i = 1,#level_handlers do
1015
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
48 level_handlers[i](source_name, level, message, ...);
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
49 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
50 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
51
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
52 return logger;
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
53 end
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
54
3357
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
55 function reset()
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
56 for level, handler_list in pairs(level_sinks) do
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
57 -- Clear all handlers for this level
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
58 for i = 1, #handler_list do
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
59 handler_list[i] = nil;
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
60 end
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
61 end
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
62 end
1dd83dd2b832 util.logger: Add reset() method to clear all sinks
Matthew Wild <mwild1@gmail.com>
parents: 2923
diff changeset
63
1015
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
64 function add_level_sink(level, sink_function)
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
65 if not level_sinks[level] then
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
66 level_sinks[level] = { sink_function };
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
67 else
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
68 level_sinks[level][#level_sinks[level] + 1 ] = sink_function;
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
69 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
70 end
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
71
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
72 _M.new = make_logger;
9e31e9397cff util.logger: Revamped logger library, but backwards-compatible for users of logger.init()
Matthew Wild <mwild1@gmail.com>
parents: 977
diff changeset
73
360
e918c979ad1a Remove or comment useless prints, or change them to log()
Matthew Wild <mwild1@gmail.com>
parents: 262
diff changeset
74 return _M;