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

got rid of the __preLog4js stuff from the console.log replacement

Browse Source
This commit is contained in:
Gareth Jones
2012-02-22 08:53:28 +11:00
parent cff20b99e3
commit 53367785b4
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/log4js.js
View File

@@ -357,28 +357,30 @@ function configure (configurationFileOrObject, options) {
configureOnceOff(config);
}
var originalConsoleFunctions = {
log: console.log,
debug: console.debug,
info: console.info,
warn: console.warn,
error: console.error
};
function replaceConsole(logger) {
function replaceWith(fn) {
return function() {
fn.apply(logger, arguments);
}
}
if (console['_preLog4js_log'] === undefined) {
logger = logger || getLogger("console");
['log','debug','info','warn','error'].forEach(function (item) {
console['_preLog4js_'+item] = console[item];
console[item] = replaceWith(item === 'log' ? logger.info : logger[item]);
});
}
logger = logger || getLogger("console");
['log','debug','info','warn','error'].forEach(function (item) {
console[item] = replaceWith(item === 'log' ? logger.info : logger[item]);
});
}
function restoreConsole() {
if (console['_preLog4js_log']) {
['log', 'debug', 'info', 'warn', 'error'].forEach(function (item) {
console[item] = console['_preLog4js_'+item];
delete console['_preLog4js_'+item];
});
}
['log', 'debug', 'info', 'warn', 'error'].forEach(function (item) {
console[item] = originalConsoleFunctions[item];
});
}
function loadAppender(appender) {

14
lib/streams.js
View File

@@ -1,12 +1,12 @@
var util = require('util'),
fs = require('fs'),
path = require('path'),
events = require('events'),
var util = require('util'),
fs = require('fs'),
path = require('path'),
events = require('events'),
async = require('async');
function debug(message) {
// util.debug(message);
console.log(message);
util.debug(message);
// console.log(message);
}
function BufferedWriteStream(stream) {
@@ -265,4 +265,4 @@ RollingFileStream.prototype.roll = function(filename, callback) {
exports.BaseRollingFileStream = BaseRollingFileStream;
exports.RollingFileStream = RollingFileStream;
exports.BufferedWriteStream = BufferedWriteStream;
exports.BufferedWriteStream = BufferedWriteStream;