From 6df4753822ab34bf91b26f172f2302942522a252 Mon Sep 17 00:00:00 2001 From: wood1986 Date: Sun, 18 Aug 2013 01:36:07 +0800 Subject: [PATCH] Update layouts.js --- lib/layouts.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/layouts.js b/lib/layouts.js index 35b2aee..eb07c89 100644 --- a/lib/layouts.js +++ b/lib/layouts.js @@ -120,6 +120,7 @@ function messagePassThroughLayout (loggingEvent) { * - %r time in toLocaleTimeString format * - %p log level * - %c log category + * - %h hostname * - %m log data * - %d date in various formats * - %% % @@ -143,7 +144,7 @@ function messagePassThroughLayout (loggingEvent) { */ function patternLayout (pattern, tokens) { 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; @@ -166,8 +167,6 @@ function patternLayout (pattern, tokens) { // 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") { @@ -177,6 +176,10 @@ function patternLayout (pattern, tokens) { // Format the date return dateFormat.asString(format, loggingEvent.startTime); } + + function hostname() { + return os.hostname().toString(); + } function formatMessage(loggingEvent) { return formatLogData(loggingEvent.data); @@ -220,6 +223,7 @@ function patternLayout (pattern, tokens) { var replacers = { 'c': categoryName, 'd': formatAsDate, + 'h': hostname, 'm': formatMessage, 'n': endOfLine, 'p': logLevel,