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

More fixes + Test for "cwd" option

Browse Source
This commit is contained in:
Shripad K
2012-02-08 10:25:14 +05:30
parent b4ca201a91
commit 0c04c6807c
3 changed files with 145 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/log4js.js
View File

@@ -325,24 +325,36 @@ function initReloadConfiguration(filename, options) {
function configure (configurationFileOrObject, options) {
var config = configurationFileOrObject;
options = options || {};
if (options.hasOwnProperty('cwd')) {
config.appenders.forEach(function(appender) {
if (appender.hasOwnProperty('filename')) {
appender.filename = options.cwd + '/' + appender.filename;
}
});
}
if (config === undefined || config === null || typeof(config) === 'string') {
if (options.reloadSecs) {
initReloadConfiguration(config, options);
}
configureOnceOff(loadConfigurationFile(config));
config = loadConfigurationFile(config);
} else {
if (options.reloadSecs) {
getLogger('log4js').warn('Ignoring configuration reload parameter for "object" configuration.');
}
configureOnceOff(config);
}
if (options.hasOwnProperty('cwd')) {
if(config.hasOwnProperty('appenders')) {
config.appenders.forEach(function(appender) {
if (!appender.hasOwnProperty('type')) return;
if (appender.type === 'file') {
if(!appender.hasOwnProperty('filename')) return;
if(appender.hasOwnProperty('absolute')) {
if(appender.absolute) return;
}
appender.filename = path.join(options.cwd, appender.filename);
}
});
}
}
configureOnceOff(config);
}
function replaceConsole(logger) {