|
|
|
@ -71,11 +71,11 @@ function colorize (str, style) {
|
|
|
|
|
return colorizeStart(style) + str + colorizeEnd(style);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function timestampLevelAndCategory(loggingEvent, colour) {
|
|
|
|
|
function timestampLevelAndCategory(loggingEvent, colour, timezoneOffest) {
|
|
|
|
|
var output = colorize(
|
|
|
|
|
formatLogData(
|
|
|
|
|
'[%s] [%s] %s - '
|
|
|
|
|
, dateFormat.asString(loggingEvent.startTime)
|
|
|
|
|
, dateFormat.asString(loggingEvent.startTime, timezoneOffest)
|
|
|
|
|
, loggingEvent.level
|
|
|
|
|
, loggingEvent.categoryName
|
|
|
|
|
)
|
|
|
|
@ -93,18 +93,19 @@ function timestampLevelAndCategory(loggingEvent, colour) {
|
|
|
|
|
*
|
|
|
|
|
* @author Stephan Strittmatter
|
|
|
|
|
*/
|
|
|
|
|
function basicLayout (loggingEvent) {
|
|
|
|
|
return timestampLevelAndCategory(loggingEvent) + formatLogData(loggingEvent.data);
|
|
|
|
|
function basicLayout (loggingEvent, timezoneOffset) {
|
|
|
|
|
return timestampLevelAndCategory(loggingEvent, undefined, timezoneOffset) + formatLogData(loggingEvent.data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* colouredLayout - taken from masylum's fork.
|
|
|
|
|
* same as basicLayout, but with colours.
|
|
|
|
|
*/
|
|
|
|
|
function colouredLayout (loggingEvent) {
|
|
|
|
|
function colouredLayout (loggingEvent, timezoneOffset) {
|
|
|
|
|
return timestampLevelAndCategory(
|
|
|
|
|
loggingEvent,
|
|
|
|
|
colours[loggingEvent.level.toString()]
|
|
|
|
|
colours[loggingEvent.level.toString()],
|
|
|
|
|
timezoneOffset
|
|
|
|
|
) + formatLogData(loggingEvent.data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -139,11 +140,12 @@ function messagePassThroughLayout (loggingEvent) {
|
|
|
|
|
* Takes a pattern string, array of tokens and returns a layout function.
|
|
|
|
|
* @param {String} Log format pattern String
|
|
|
|
|
* @param {object} map object of different tokens
|
|
|
|
|
* @param {number} timezone offset in minutes
|
|
|
|
|
* @return {Function}
|
|
|
|
|
* @author Stephan Strittmatter
|
|
|
|
|
* @author Jan Schmidle
|
|
|
|
|
*/
|
|
|
|
|
function patternLayout (pattern, tokens) {
|
|
|
|
|
function patternLayout (pattern, tokens, timezoneOffset) {
|
|
|
|
|
var TTCC_CONVERSION_PATTERN = "%r %p %c - %m%n";
|
|
|
|
|
var regex = /%(-?[0-9]+)?(\.?[0-9]+)?([\[\]cdhmnprzxy%])(\{([^\}]+)\})?|([^%]+)/;
|
|
|
|
|
|
|
|
|
@ -177,7 +179,7 @@ function patternLayout (pattern, tokens) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Format the date
|
|
|
|
|
return dateFormat.asString(format, loggingEvent.startTime);
|
|
|
|
|
return dateFormat.asString(format, loggingEvent.startTime, timezoneOffset);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function hostname() {
|
|
|
|
@ -197,7 +199,7 @@ function patternLayout (pattern, tokens) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function startTime(loggingEvent) {
|
|
|
|
|
return "" + loggingEvent.startTime.toLocaleTimeString();
|
|
|
|
|
return dateFormat.asString('hh:mm:ss', loggingEvent.startTime, timezoneOffset);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function startColour(loggingEvent) {
|
|
|
|
|