diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-19 09:31:12 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-19 09:31:12 +0100 |
| commit | ebe83d27d3179fa5d3c1452a8633a49d85a94f60 (patch) | |
| tree | 6225faf7bc524edf57e2118bc8633e07d2b28333 /core/loggingmanager.lua | |
| parent | 879862c536a5fba488307eb9e8a2f4f6523dbf09 (diff) | |
| parent | 79534953279caa15362184c30db97c354e2d7364 (diff) | |
| download | prosody-ebe83d27d3179fa5d3c1452a8633a49d85a94f60.tar.gz prosody-ebe83d27d3179fa5d3c1452a8633a49d85a94f60.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/loggingmanager.lua')
| -rw-r--r-- | core/loggingmanager.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua index f348dbdf..57ed8687 100644 --- a/core/loggingmanager.lua +++ b/core/loggingmanager.lua @@ -177,8 +177,8 @@ end -- Column width for "source" (used by stdout and console) local sourcewidth = 20; -function log_sink_types.stdout(config) - local timestamps = config.timestamps; +function log_sink_types.stdout(sink_config) + local timestamps = sink_config.timestamps; if timestamps == true then timestamps = default_timestamp; -- Default format @@ -207,13 +207,13 @@ do logstyles["warn"] = getstyle("bold", "yellow"); logstyles["error"] = getstyle("bold", "red"); end - function log_sink_types.console(config) + function log_sink_types.console(sink_config) -- Really if we don't want pretty colours then just use plain stdout if not do_pretty_printing then - return log_sink_types.stdout(config); + return log_sink_types.stdout(sink_config); end - local timestamps = config.timestamps; + local timestamps = sink_config.timestamps; if timestamps == true then timestamps = default_timestamp; -- Default format @@ -240,15 +240,15 @@ do end local empty_function = function () end; -function log_sink_types.file(config) - local log = config.filename; +function log_sink_types.file(sink_config) + local log = sink_config.filename; local logfile = io_open(log, "a+"); if not logfile then return empty_function; end local write, flush = logfile.write, logfile.flush; - local timestamps = config.timestamps; + local timestamps = sink_config.timestamps; if timestamps == nil or timestamps == true then timestamps = default_timestamp; -- Default format |