@bitblit/ratchet-common 5.0.572-alpha → 5.0.574-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/logger/classic-single-line-log-message-formatter.js +2 -2
- package/lib/logger/classic-single-line-log-message-formatter.js.map +1 -1
- package/lib/logger/logger.d.ts +1 -1
- package/lib/logger/logger.js +2 -2
- package/lib/logger/logger.js.map +1 -1
- package/lib/logger/structured-json-log-message-formatter.js +3 -3
- package/lib/logger/structured-json-log-message-formatter.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,9 +4,9 @@ export class ClassicSingleLineLogMessageFormatter {
|
|
|
4
4
|
let tmp = null;
|
|
5
5
|
if (msg) {
|
|
6
6
|
tmp = '';
|
|
7
|
-
tmp += meta
|
|
7
|
+
tmp += meta?.options?.trace ? meta.options.trace + ' ' : '';
|
|
8
8
|
tmp += '[' + msg.lvl + '] ';
|
|
9
|
-
tmp += StringRatchet.format(msg.messageSource, ...msg.subsVars);
|
|
9
|
+
tmp += StringRatchet.format(msg.messageSource, ...(msg.subsVars || []));
|
|
10
10
|
}
|
|
11
11
|
return tmp;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classic-single-line-log-message-formatter.js","sourceRoot":"","sources":["../../src/logger/classic-single-line-log-message-formatter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,OAAO,oCAAoC;IACxC,aAAa,CAAC,GAAe,EAAE,IAAgB;QACpD,IAAI,GAAG,GAAW,IAAI,CAAC;QAEvB,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,GAAG,EAAE,CAAC;YACT,GAAG,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"classic-single-line-log-message-formatter.js","sourceRoot":"","sources":["../../src/logger/classic-single-line-log-message-formatter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,OAAO,oCAAoC;IACxC,aAAa,CAAC,GAAe,EAAE,IAAgB;QACpD,IAAI,GAAG,GAAW,IAAI,CAAC;QAEvB,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,GAAG,EAAE,CAAC;YACT,GAAG,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAE5D,GAAG,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC;YAC5B,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF"}
|
package/lib/logger/logger.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { LogMessageBuilder } from './log-message-builder.js';
|
|
|
8
8
|
export declare class Logger {
|
|
9
9
|
private static LOGGER_INSTANCE_MAP_GLOBAL_KEY;
|
|
10
10
|
private static DEFAULT_OPTIONS;
|
|
11
|
-
static applyDefaultsToOptions(input?: LoggerOptions): LoggerOptions;
|
|
11
|
+
static applyDefaultsToOptions(input?: Partial<LoggerOptions>): LoggerOptions;
|
|
12
12
|
private static loggerInstances;
|
|
13
13
|
static changeDefaultOptions(input: LoggerOptions, retroactive?: boolean): void;
|
|
14
14
|
static getLogger(loggerName?: string, inOptions?: LoggerOptions): LoggerInstance;
|
package/lib/logger/logger.js
CHANGED
|
@@ -85,8 +85,8 @@ export class Logger {
|
|
|
85
85
|
Logger.getLogger().level = newLevel;
|
|
86
86
|
}
|
|
87
87
|
static ringBufferOnlyMode(ringBufferSize = 1000) {
|
|
88
|
-
Logger.
|
|
89
|
-
Logger.
|
|
88
|
+
const newOptions = Logger.applyDefaultsToOptions({ ringBufferSize: ringBufferSize, outputFunction: LoggerOutputFunction.Disabled });
|
|
89
|
+
Logger.changeDefaultOptions(newOptions, true);
|
|
90
90
|
}
|
|
91
91
|
static getOptions() {
|
|
92
92
|
return Logger.getLogger().options;
|
package/lib/logger/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAY1D,MAAM,OAAO,MAAM;IACT,MAAM,CAAC,8BAA8B,GAAG,+BAA+B,CAAC;IAExE,MAAM,CAAC,eAAe,GAAkB;QAC9C,YAAY,EAAE,eAAe,CAAC,IAAI;QAClC,UAAU,EAAE,oBAAoB,CAAC,iBAAiB;QAClD,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,EAAE;QACd,cAAc,EAAE,oBAAoB,CAAC,OAAO;QAC5C,cAAc,EAAE,CAAC;QACjB,aAAa,EAAE,EAAE;KAClB,CAAC;IAEK,MAAM,CAAC,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,11 @@ export class StructuredJsonLogMessageFormatter {
|
|
|
3
3
|
formatMessage(msg, meta) {
|
|
4
4
|
let rval = null;
|
|
5
5
|
if (msg) {
|
|
6
|
-
const tmp = Object.assign({}, meta
|
|
7
|
-
tmp['msg'] = StringRatchet.format(msg
|
|
6
|
+
const tmp = Object.assign({}, meta?.options?.globalVars || {}, msg?.params || {});
|
|
7
|
+
tmp['msg'] = StringRatchet.format(msg?.messageSource, ...(msg.subsVars || []));
|
|
8
8
|
tmp['utcDateTime'] = new Date(msg.timestamp).toISOString();
|
|
9
9
|
tmp['logLevel'] = msg.lvl;
|
|
10
|
-
if (meta
|
|
10
|
+
if (meta?.options?.trace) {
|
|
11
11
|
tmp['trace'] = meta.options.trace;
|
|
12
12
|
}
|
|
13
13
|
tmp['logName'] = meta.loggerInstanceName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structured-json-log-message-formatter.js","sourceRoot":"","sources":["../../src/logger/structured-json-log-message-formatter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,OAAO,iCAAiC;IACrC,aAAa,CAAC,GAAe,EAAE,IAAgB;QACpD,IAAI,IAAI,GAAW,IAAI,CAAC;QACxB,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,GAAG,GAAqB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"structured-json-log-message-formatter.js","sourceRoot":"","sources":["../../src/logger/structured-json-log-message-formatter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,OAAO,iCAAiC;IACrC,aAAa,CAAC,GAAe,EAAE,IAAgB;QACpD,IAAI,IAAI,GAAW,IAAI,CAAC;QACxB,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,GAAG,GAAqB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,IAAI,EAAE,EAAE,GAAG,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC;YACpG,GAAG,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;YAC/E,GAAG,CAAC,aAAa,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;YAC3D,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC;YAC1B,IAAI,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;gBACzB,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YACpC,CAAC;YACD,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC;YAErC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QAEpC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|