projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.pposix: Replace the unwieldy module table generation with luaL_register() call...
[prosody.git]
/
core
/
loggingmanager.lua
diff --git
a/core/loggingmanager.lua
b/core/loggingmanager.lua
index 2be21a1771cd6e81c16ab1a7a56d9fb4a589f21b..4154e1a7b3131656091ae2e6376c553fde185a4b 100644
(file)
--- a/
core/loggingmanager.lua
+++ b/
core/loggingmanager.lua
@@
-1,3
+1,11
@@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
local format, rep = string.format, string.rep;
local pcall = pcall;
local format, rep = string.format, string.rep;
local pcall = pcall;
@@
-9,6
+17,12
@@
local math_max, rep = math.max, string.rep;
local os_date, os_getenv = os.date, os.getenv;
local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
local os_date, os_getenv = os.date, os.getenv;
local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
+if os.getenv("__FLUSH_LOG") then
+ local io_flush = io.flush;
+ local _io_write = io_write;
+ io_write = function(...) _io_write(...); io_flush(); end
+end
+
local config = require "core.configmanager";
local eventmanager = require "core.eventmanager";
local logger = require "util.logger";
local config = require "core.configmanager";
local eventmanager = require "core.eventmanager";
local logger = require "util.logger";
@@
-179,6
+193,7
@@
do
return function (name, level, message, ...)
sourcewidth = math_max(#name+2, sourcewidth);
local namelen = #name;
return function (name, level, message, ...)
sourcewidth = math_max(#name+2, sourcewidth);
local namelen = #name;
+
if timestamps then
io_write(os_date(timestamps), " ");
end
if timestamps then
io_write(os_date(timestamps), " ");
end
@@
-214,7
+229,7
@@
function log_sink_types.file(config)
local timestamps = config.timestamps;
local timestamps = config.timestamps;
- if timestamps == true then
+ if timestamps ==
nil or timestamps ==
true then
timestamps = default_timestamp; -- Default format
end
timestamps = default_timestamp; -- Default format
end