Update layouts.js

This commit is contained in:
wood1986
2013-08-18 01:36:07 +08:00
parent 613474eb44
commit 6df4753822
+7 -3
View File
@@ -120,6 +120,7 @@ function messagePassThroughLayout (loggingEvent) {
* - %r time in toLocaleTimeString format * - %r time in toLocaleTimeString format
* - %p log level * - %p log level
* - %c log category * - %c log category
* - %h hostname
* - %m log data * - %m log data
* - %d date in various formats * - %d date in various formats
* - %% % * - %% %
@@ -143,7 +144,7 @@ function messagePassThroughLayout (loggingEvent) {
*/ */
function patternLayout (pattern, tokens) { function patternLayout (pattern, tokens) {
var TTCC_CONVERSION_PATTERN = "%r %p %c - %m%n"; var TTCC_CONVERSION_PATTERN = "%r %p %c - %m%n";
var regex = /%(-?[0-9]+)?(\.?[0-9]+)?([\[\]cdmnprx%])(\{([^\}]+)\})?|([^%]+)/; var regex = /%(-?[0-9]+)?(\.?[0-9]+)?([\[\]cdhmnprx%])(\{([^\}]+)\})?|([^%]+)/;
pattern = pattern || TTCC_CONVERSION_PATTERN; pattern = pattern || TTCC_CONVERSION_PATTERN;
@@ -166,8 +167,6 @@ function patternLayout (pattern, tokens) {
// Pick up special cases // Pick up special cases
if (format == "ISO8601") { if (format == "ISO8601") {
format = dateFormat.ISO8601_FORMAT; format = dateFormat.ISO8601_FORMAT;
} else if (format == "ISO8601_WITH_TZ_OFFSET") {
format = dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT;
} else if (format == "ABSOLUTE") { } else if (format == "ABSOLUTE") {
format = dateFormat.ABSOLUTETIME_FORMAT; format = dateFormat.ABSOLUTETIME_FORMAT;
} else if (format == "DATE") { } else if (format == "DATE") {
@@ -177,6 +176,10 @@ function patternLayout (pattern, tokens) {
// Format the date // Format the date
return dateFormat.asString(format, loggingEvent.startTime); return dateFormat.asString(format, loggingEvent.startTime);
} }
function hostname() {
return os.hostname().toString();
}
function formatMessage(loggingEvent) { function formatMessage(loggingEvent) {
return formatLogData(loggingEvent.data); return formatLogData(loggingEvent.data);
@@ -220,6 +223,7 @@ function patternLayout (pattern, tokens) {
var replacers = { var replacers = {
'c': categoryName, 'c': categoryName,
'd': formatAsDate, 'd': formatAsDate,
'h': hostname,
'm': formatMessage, 'm': formatMessage,
'n': endOfLine, 'n': endOfLine,
'p': logLevel, 'p': logLevel,