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

Removed property 'level' from the file appender, because that functionality is provided by appender logLevelFilter.

Browse Source
This commit is contained in:
Luis Malheiro
2014-09-08 11:33:22 +02:00
parent 492c45d055
commit 17c9b29ca5
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/appenders/file.js
View File

@@ -27,7 +27,7 @@ process.on('exit', function() {
* @param numBackups - the number of log files to keep after logSize
* has been reached (default 5)
*/
function fileAppender (file, layout, logSize, numBackups, level, compress) {
function fileAppender (file, layout, logSize, numBackups, compress) {
var bytesWritten = 0;
file = path.normalize(file);
layout = layout || layouts.basicLayout;
@@ -63,21 +63,9 @@ function fileAppender (file, layout, logSize, numBackups, level, compress) {
// push file to the stack of open handlers
openFiles.push(logFile);
if (level) {
var obj = levels.toLevel(level, levels.TRACE);
return function(loggingEvent) {
if (obj.isLessThanOrEqualTo(loggingEvent.level))
logFile.write(layout(loggingEvent) + eol, "utf8");
};
} else {
return function(loggingEvent) {
logFile.write(layout(loggingEvent) + eol, "utf8");
};
}
return function(loggingEvent) {
logFile.write(layout(loggingEvent) + eol, "utf8");
};
}
@@ -91,7 +79,7 @@ function configure(config, options) {
config.filename = path.join(options.cwd, config.filename);
}
return fileAppender(config.filename, layout, config.maxLogSize, config.backups, config.level, config.compress);
return fileAppender(config.filename, layout, config.maxLogSize, config.backups, config.compress);
}
function shutdown(cb) {

6
test/fileAppender-test.js
View File

@@ -149,7 +149,7 @@ vows.describe('log4js fileAppender').addBatch({
file_sub1_sub12$sub1_sub13: fs.readFileSync(file_sub1_sub12$sub1_sub13).toString(),
file_sub1_sub12: fs.readFileSync(file_sub1_sub12).toString()
});
}, 1000);
}, 3000);
},
'check file contents': function (err, fileContents) {
@@ -291,7 +291,7 @@ vows.describe('log4js fileAppender').addBatch({
//log file of 50 bytes maximum, 2 backups
log4js.clearAppenders();
log4js.addAppender(
require('../lib/appenders/file').appender(testFile, log4js.layouts.basicLayout, 50, 2, null, true),
require('../lib/appenders/file').appender(testFile, log4js.layouts.basicLayout, 50, 2, true),
'max-file-size-backups'
);
logger.info("This is the first log message.");
@@ -308,7 +308,7 @@ vows.describe('log4js fileAppender').addBatch({
that.callback(err, files);
}
});
}, 200);
}, 1000);
},
'the log files': {
topic: function(files) {