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

fixing some lint issues

Browse Source
This commit is contained in:
Gareth Jones
2013-08-29 16:56:40 +10:00
parent 46ad57b4e0
commit 5e144e4004
17 changed files with 181 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/appenders/dateFile.js
View File

@@ -47,10 +47,6 @@ function configure(config, options) {
config.alwaysIncludePattern = false;
}
if (options && options.cwd && !config.absolute) {
config.filename = path.join(options.cwd, config.filename);
}
return appender(config.filename, config.pattern, config.alwaysIncludePattern, layout);
}

19
lib/layouts.js
View File

@@ -160,20 +160,17 @@ function patternLayout (pattern, tokens) {
return loggerName;
}
var formats = {
"ISO8601": dateFormat.ISO8601_FORMAT,
"ISO8601_WITH_TZ_OFFSET": dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT,
"ABSOLUTE": dateFormat.ABSOLUTETIME_FORMAT,
"DATE": dateFormat.DATETIME_FORMAT
};
function formatAsDate(loggingEvent, specifier) {
var format = dateFormat.ISO8601_FORMAT;
if (specifier) {
format = specifier;
// Pick up special cases
if (format == "ISO8601") {
format = dateFormat.ISO8601_FORMAT;
} else if (format == "ISO8601_WITH_TZ_OFFSET") {
format = dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT;
} else if (format == "ABSOLUTE") {
format = dateFormat.ABSOLUTETIME_FORMAT;
} else if (format == "DATE") {
format = dateFormat.DATETIME_FORMAT;
}
format = formats[specifier] || specifier;
}
// Format the date
return dateFormat.asString(format, loggingEvent.startTime);

43
lib/log4js.js
View File

@@ -125,7 +125,14 @@ function workerDispatch(event) {
function dispatch(event) {
debug("event is ", event);
var category = categories[event.category] || categories.default;
debug("category.level[", category.level, "] <= ", event.level, " ? ", category.level.isLessThanOrEqualTo(event.level));
debug(
"category.level[",
category.level,
"] <= ",
event.level,
" ? ",
category.level.isLessThanOrEqualTo(event.level)
);
if (category.level.isLessThanOrEqualTo(event.level)) {
category.appenders.forEach(function(appender) {
@@ -182,7 +189,11 @@ function validateCategories(cats) {
}
category.level = levels.toLevel(inputLevel);
if (!category.level) {
throw new Error("Level '" + inputLevel + "' is not valid for category '" + categoryName + "'. Acceptable values are: " + levels.levels.join(', ') + ".");
throw new Error(
"Level '" + inputLevel +
"' is not valid for category '" + categoryName +
"'. Acceptable values are: " + levels.levels.join(', ') + "."
);
}
if (!category.appenders || !category.appenders.length) {
@@ -191,7 +202,11 @@ function validateCategories(cats) {
category.appenders.forEach(function(appender) {
if (!appenders[appender]) {
throw new Error("Appender '" + appender + "' for category '" + categoryName + "' does not exist. Known appenders are: " + Object.keys(appenders).join(', ') + ".");
throw new Error(
"Appender '" + appender +
"' for category '" + categoryName +
"' does not exist. Known appenders are: " + Object.keys(appenders).join(', ') + "."
);
}
});
});
@@ -213,14 +228,20 @@ function appenderByName(name) {
function configureAppenders(appenderMap) {
clearAppenders();
Object.keys(appenderMap).forEach(function(appenderName) {
var appender, appenderConfig = appenderMap[appenderName];
loadAppender(appenderConfig.type);
appenderConfig.makers = appenderMakers;
try {
appenders[appenderName] = appenderMakers[appenderConfig.type](appenderConfig, appenderByName);
} catch(e) {
throw new Error("log4js configuration problem for appender '" + appenderName + "'. Error was " + e.stack);
}
var appender, appenderConfig = appenderMap[appenderName];
loadAppender(appenderConfig.type);
appenderConfig.makers = appenderMakers;
try {
appenders[appenderName] = appenderMakers[appenderConfig.type](
appenderConfig,
appenderByName
);
} catch(e) {
throw new Error(
"log4js configuration problem for appender '" + appenderName +
"'. Error was " + e.stack
);
}
});
}