diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-18 19:09:07 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-18 19:09:07 +0100 |
| commit | 79534953279caa15362184c30db97c354e2d7364 (patch) | |
| tree | f55719c2e0fce0bc979cab035a6940647ed798a0 | |
| parent | 7a577b72e6b8616aff1e2ea66460fff5948c5804 (diff) | |
| download | prosody-79534953279caa15362184c30db97c354e2d7364.tar.gz prosody-79534953279caa15362184c30db97c354e2d7364.zip | |
loggingmanager: Rename function arguments to avoid name conflict [luacheck] (core/ is now luacheck-clean!)
| -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 |