cartodb4/log4js-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to handle drain events not fired on write in linux & windows - should fix issue #44

Browse Source
This commit is contained in:
Gareth Jones
2011-11-24 08:20:33 +11:00
parent a3a0c55322
commit cea3dc97d1
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/appenders/file.js
View File

@@ -86,14 +86,15 @@ function fileAppender (file, layout, logSize, numBackups) {
function openTheStream() { function openTheStream() {
var stream = fs.createWriteStream(file, { flags: 'a', mode: 0644, encoding: 'utf8' }); var stream = fs.createWriteStream(file, { flags: 'a', mode: 0644, encoding: 'utf8' });
stream.on("open", function() { stream.on("open", function() {
if (logEventBuffer.length > 0) { canWrite = true;
writeToLog(logEventBuffer.shift()); flushBuffer();
}
}); });
stream.on("error", function (err) { stream.on("error", function (err) {
console.error("log4js.fileAppender - Writing to file %s, error happened ", file, err); console.error("log4js.fileAppender - Writing to file %s, error happened ", file, err);
}); });
stream.on("drain", function() { stream.on("drain", function() {
canWrite = true;
flushBuffer();
if (logEventBuffer.length > 0) { if (logEventBuffer.length > 0) {
writeToLog(logEventBuffer.shift()); writeToLog(logEventBuffer.shift());
} }
@@ -101,9 +102,15 @@ function fileAppender (file, layout, logSize, numBackups) {
return stream; return stream;
} }
function flushBuffer() {
while (logEventBuffer.length > 0 && canWrite) {
writeToLog(logEventBuffer.shift());
}
}
var logEventBuffer = [] var logEventBuffer = []
, logFile = openTheStream(); , canWrite = false
, logFile = openTheStream();
if (logSize > 0) { if (logSize > 0) {
setupLogRolling(); setupLogRolling();
@@ -111,6 +118,7 @@ function fileAppender (file, layout, logSize, numBackups) {
//close the file on process exit. //close the file on process exit.
process.on('exit', function() { process.on('exit', function() {
flushBuffer();
logFile.end(); logFile.end();
logFile.destroy(); logFile.destroy();
}); });
@@ -119,7 +127,7 @@ function fileAppender (file, layout, logSize, numBackups) {
var logMessage = layout(loggingEvent)+'\n'; var logMessage = layout(loggingEvent)+'\n';
//not entirely accurate, but it'll do. //not entirely accurate, but it'll do.
bytesWritten += logMessage.length; bytesWritten += logMessage.length;
logFile.write(logMessage, "utf8"); canWrite = logFile.write(logMessage, "utf8");
if (bytesWritten >= logSize) { if (bytesWritten >= logSize) {
rollThatLog(); rollThatLog();
} }
@@ -127,6 +135,7 @@ function fileAppender (file, layout, logSize, numBackups) {
return function(loggingEvent) { return function(loggingEvent) {
logEventBuffer.push(loggingEvent); logEventBuffer.push(loggingEvent);
flushBuffer();
}; };
} }