Software / code / prosody
Changeset
7126:de3659191e90
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 04 Feb 2016 14:57:45 +0000 |
| parents | 7124:a0764a8d6b26 (current diff) 7125:631c47a65519 (diff) |
| children | 7141:362545c3f8bb |
| files | |
| diffstat | 1 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/core/loggingmanager.lua Thu Feb 04 09:18:53 2016 +0100 +++ b/core/loggingmanager.lua Thu Feb 04 14:57:45 2016 +0000 @@ -15,6 +15,7 @@ local os_date = os.date; local getstyle, setstyle = require "util.termcolours".getstyle, require "util.termcolours".setstyle; +-- COMPAT: This should no longer be needed since the addition of setvbuf calls if os.getenv("__FLUSH_LOG") then local io_flush = io.flush; local _io_write = io_write; @@ -157,7 +158,6 @@ 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 @@ -185,6 +185,10 @@ timestamps = default_timestamp; -- Default format end + if sink_config.buffer_mode ~= false then + io.stdout:setvbuf(sink_config.buffer_mode or "line"); + end + return function (name, level, message, ...) sourcewidth = math_max(#name+2, sourcewidth); local namelen = #name; @@ -220,6 +224,10 @@ timestamps = default_timestamp; -- Default format end + if sink_config.buffer_mode ~= false then + io.stdout:setvbuf(sink_config.buffer_mode or "line"); + end + return function (name, level, message, ...) sourcewidth = math_max(#name+2, sourcewidth); local namelen = #name; @@ -247,7 +255,12 @@ if not logfile then return empty_function; end - local write, flush = logfile.write, logfile.flush; + + if sink_config.buffer_mode ~= false then + logfile:setvbuf(sink_config.buffer_mode or "line"); + end + + local write = logfile.write; local timestamps = sink_config.timestamps; @@ -264,7 +277,6 @@ else write(logfile, name, "\t" , level, "\t", message, "\n"); end - flush(logfile); end; end
