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

fixed patternlayout, needs tests though

Browse Source
This commit is contained in:
Gareth Jones
2011-07-13 18:42:56 +10:00
parent d7ffa59434
commit 3691648cd0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/layouts.js
View File

@@ -127,12 +127,12 @@ function patternLayout (pattern) {
var TTCC_CONVERSION_PATTERN = "%r %p %c - %m%n"; var TTCC_CONVERSION_PATTERN = "%r %p %c - %m%n";
var regex = /%(-?[0-9]+)?(\.?[0-9]+)?([cdmnpr%])(\{([^\}]+)\})?|([^%]+)/; var regex = /%(-?[0-9]+)?(\.?[0-9]+)?([cdmnpr%])(\{([^\}]+)\})?|([^%]+)/;
pattern = pattern || patternLayout.TTCC_CONVERSION_PATTERN; pattern = pattern || TTCC_CONVERSION_PATTERN;
return function(loggingEvent) { return function(loggingEvent) {
var formattedString = ""; var formattedString = "";
var result; var result;
var searchString = this.pattern; var searchString = pattern;
while ((result = regex.exec(searchString))) { while ((result = regex.exec(searchString))) {
var matchedString = result[0]; var matchedString = result[0];
@@ -181,7 +181,7 @@ function patternLayout (pattern) {
replacement = dateFormat.asString(format, loggingEvent.startTime); replacement = dateFormat.asString(format, loggingEvent.startTime);
break; break;
case "m": case "m":
replacement = loggingEvent.message; replacement = formatLogData(loggingEvent.data);
break; break;
case "n": case "n":
replacement = "\n"; replacement = "\n";