@pristine-ts/logging 0.0.135 → 0.0.139
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/dist/lib/cjs/handlers/log.handler.js +25 -3
- package/dist/lib/cjs/handlers/log.handler.js.map +1 -1
- package/dist/lib/cjs/loggers/base.logger.js +92 -0
- package/dist/lib/cjs/loggers/base.logger.js.map +1 -0
- package/dist/lib/cjs/loggers/console.logger.js +7 -57
- package/dist/lib/cjs/loggers/console.logger.js.map +1 -1
- package/dist/lib/cjs/loggers/file.logger.js +17 -50
- package/dist/lib/cjs/loggers/file.logger.js.map +1 -1
- package/dist/lib/cjs/logging.module.js +11 -1
- package/dist/lib/cjs/logging.module.js.map +1 -1
- package/dist/lib/cjs/models/diagnostics.model.js +10 -0
- package/dist/lib/cjs/models/diagnostics.model.js.map +1 -0
- package/dist/lib/cjs/models/log.model.js.map +1 -1
- package/dist/lib/cjs/models/models.js +1 -0
- package/dist/lib/cjs/models/models.js.map +1 -1
- package/dist/lib/cjs/utils/utils.js +30 -7
- package/dist/lib/cjs/utils/utils.js.map +1 -1
- package/dist/lib/esm/handlers/log.handler.js +27 -5
- package/dist/lib/esm/handlers/log.handler.js.map +1 -1
- package/dist/lib/esm/loggers/base.logger.js +88 -0
- package/dist/lib/esm/loggers/base.logger.js.map +1 -0
- package/dist/lib/esm/loggers/console.logger.js +9 -59
- package/dist/lib/esm/loggers/console.logger.js.map +1 -1
- package/dist/lib/esm/loggers/file.logger.js +19 -52
- package/dist/lib/esm/loggers/file.logger.js.map +1 -1
- package/dist/lib/esm/logging.module.js +11 -1
- package/dist/lib/esm/logging.module.js.map +1 -1
- package/dist/lib/esm/models/diagnostics.model.js +6 -0
- package/dist/lib/esm/models/diagnostics.model.js.map +1 -0
- package/dist/lib/esm/models/log.model.js.map +1 -1
- package/dist/lib/esm/models/models.js +1 -0
- package/dist/lib/esm/models/models.js.map +1 -1
- package/dist/lib/esm/utils/utils.js +30 -7
- package/dist/lib/esm/utils/utils.js.map +1 -1
- package/dist/types/handlers/log.handler.d.ts +5 -1
- package/dist/types/loggers/base.logger.d.ts +25 -0
- package/dist/types/loggers/console.logger.d.ts +5 -20
- package/dist/types/loggers/file.logger.d.ts +7 -19
- package/dist/types/models/diagnostics.model.d.ts +15 -0
- package/dist/types/models/log.model.d.ts +2 -0
- package/dist/types/models/models.d.ts +1 -0
- package/dist/types/utils/utils.d.ts +3 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;AACA,gEAAyD;AACzD,0DAAoD;AACpD,6DAAqC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,17 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
import "reflect-metadata";
|
|
14
|
-
import { injectable, injectAll,
|
|
14
|
+
import { injectable, injectAll, inject } from "tsyringe";
|
|
15
15
|
import { SeverityEnum } from "../enums/severity.enum";
|
|
16
16
|
import { LogModel } from "../models/log.model";
|
|
17
|
-
import { ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
|
|
17
|
+
import { ServiceDefinitionTagEnum, tag, TracingContext, InternalContainerParameterEnum } from "@pristine-ts/common";
|
|
18
|
+
import { Utils } from "../utils/utils";
|
|
18
19
|
let LogHandler = class LogHandler {
|
|
19
|
-
constructor(loggers) {
|
|
20
|
+
constructor(loggers, logSeverityLevelConfiguration, kernelInstantiationId, tracingContext) {
|
|
20
21
|
this.loggers = loggers;
|
|
22
|
+
this.logSeverityLevelConfiguration = logSeverityLevelConfiguration;
|
|
23
|
+
this.kernelInstantiationId = kernelInstantiationId;
|
|
24
|
+
this.tracingContext = tracingContext;
|
|
21
25
|
}
|
|
22
26
|
error(message, extra, module = "application") {
|
|
23
27
|
return this.log(message, SeverityEnum.Error, extra, module);
|
|
@@ -36,11 +40,28 @@ let LogHandler = class LogHandler {
|
|
|
36
40
|
}
|
|
37
41
|
log(message, severity = SeverityEnum.Error, extra, module = "application") {
|
|
38
42
|
const log = new LogModel();
|
|
43
|
+
log.traceId = this.tracingContext.traceId;
|
|
44
|
+
log.kernelInstantiationId = this.kernelInstantiationId;
|
|
39
45
|
log.extra = extra;
|
|
40
46
|
log.severity = severity;
|
|
41
47
|
log.message = message;
|
|
42
48
|
log.module = module;
|
|
43
49
|
log.date = new Date();
|
|
50
|
+
// If the logSeveritylevel configuration is set to debug, we will include additional information into a __diagnostics path into extra.
|
|
51
|
+
// This is an intensive process and will only be available when in Debug
|
|
52
|
+
if (this.logSeverityLevelConfiguration === SeverityEnum.Debug) {
|
|
53
|
+
const diagnostics = Utils.getDiagnostics(new Error());
|
|
54
|
+
// Properly define which last stack trace is actually the one we want to report. In this case, it's the stack trace
|
|
55
|
+
// Just before any entries in LogHandler.
|
|
56
|
+
for (const stackTrace of diagnostics.stackTrace) {
|
|
57
|
+
if (stackTrace.className === undefined || stackTrace.className === "" || stackTrace.className.startsWith("LogHandler") || stackTrace.className.startsWith("Array")) {
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
diagnostics.lastStackTrace = stackTrace;
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
log.extra["__diagnostics"] = diagnostics;
|
|
64
|
+
}
|
|
44
65
|
for (const writer of this.loggers) {
|
|
45
66
|
if (writer.isActive()) {
|
|
46
67
|
writer.readableStream.push(log);
|
|
@@ -49,11 +70,12 @@ let LogHandler = class LogHandler {
|
|
|
49
70
|
}
|
|
50
71
|
};
|
|
51
72
|
LogHandler = __decorate([
|
|
52
|
-
singleton(),
|
|
53
73
|
tag("LogHandlerInterface"),
|
|
54
74
|
injectable(),
|
|
55
75
|
__param(0, injectAll(ServiceDefinitionTagEnum.Logger)),
|
|
56
|
-
|
|
76
|
+
__param(1, inject("%pristine.logging.logSeverityLevelConfiguration%")),
|
|
77
|
+
__param(2, inject(InternalContainerParameterEnum.KernelInstantiationId)),
|
|
78
|
+
__metadata("design:paramtypes", [Array, Number, String, TracingContext])
|
|
57
79
|
], LogHandler);
|
|
58
80
|
export { LogHandler };
|
|
59
81
|
//# sourceMappingURL=log.handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.handler.js","sourceRoot":"","sources":["../../../../src/handlers/log.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,kBAAkB,CAAA;AACzB,OAAO,EAAC,UAAU,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"log.handler.js","sourceRoot":"","sources":["../../../../src/handlers/log.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { SeverityEnum } from "../enums/severity.enum";
|
|
2
|
+
import { Utils } from "../utils/utils";
|
|
3
|
+
import { CommonModuleKeyname } from "@pristine-ts/common";
|
|
4
|
+
import { OutputModeEnum } from "../enums/output-mode.enum";
|
|
5
|
+
export class BaseLogger {
|
|
6
|
+
constructor(numberOfStackedLogs, logSeverityLevelConfiguration, logDebugDepthConfiguration, logInfoDepthConfiguration, logWarningDepthConfiguration, logErrorDepthConfiguration, logCriticalDepthConfiguration, isActivated = true, outputMode = OutputModeEnum.Json, spaces = 2) {
|
|
7
|
+
this.numberOfStackedLogs = numberOfStackedLogs;
|
|
8
|
+
this.logSeverityLevelConfiguration = logSeverityLevelConfiguration;
|
|
9
|
+
this.logDebugDepthConfiguration = logDebugDepthConfiguration;
|
|
10
|
+
this.logInfoDepthConfiguration = logInfoDepthConfiguration;
|
|
11
|
+
this.logWarningDepthConfiguration = logWarningDepthConfiguration;
|
|
12
|
+
this.logErrorDepthConfiguration = logErrorDepthConfiguration;
|
|
13
|
+
this.logCriticalDepthConfiguration = logCriticalDepthConfiguration;
|
|
14
|
+
this.isActivated = isActivated;
|
|
15
|
+
this.outputMode = outputMode;
|
|
16
|
+
this.spaces = spaces;
|
|
17
|
+
this.stackedLogs = {};
|
|
18
|
+
}
|
|
19
|
+
isActive() {
|
|
20
|
+
return this.isActivated;
|
|
21
|
+
}
|
|
22
|
+
outputLog(log) {
|
|
23
|
+
switch (log.severity) {
|
|
24
|
+
case SeverityEnum.Debug:
|
|
25
|
+
return Utils.outputLog(log, this.outputMode, this.logDebugDepthConfiguration);
|
|
26
|
+
case SeverityEnum.Info:
|
|
27
|
+
return Utils.outputLog(log, this.outputMode, this.logInfoDepthConfiguration);
|
|
28
|
+
case SeverityEnum.Warning:
|
|
29
|
+
return Utils.outputLog(log, this.outputMode, this.logWarningDepthConfiguration);
|
|
30
|
+
case SeverityEnum.Error:
|
|
31
|
+
return Utils.outputLog(log, this.outputMode, this.logErrorDepthConfiguration);
|
|
32
|
+
case SeverityEnum.Critical:
|
|
33
|
+
return Utils.outputLog(log, this.outputMode, this.logCriticalDepthConfiguration);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
captureLog(log) {
|
|
37
|
+
this.setupStackedLogsArrayIfRequired(log.traceId);
|
|
38
|
+
if (log.severity < this.logSeverityLevelConfiguration) {
|
|
39
|
+
// We still add a log to the stack to ensure that when there's an error, we log everything.
|
|
40
|
+
this.addStackedLog(log);
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
//todo do we really want to always print the stacked logs ?
|
|
44
|
+
this.outputStackedLogs();
|
|
45
|
+
this.log(log);
|
|
46
|
+
}
|
|
47
|
+
setupStackedLogsArrayIfRequired(traceId) {
|
|
48
|
+
var _a;
|
|
49
|
+
if (this.stackedLogs.hasOwnProperty(CommonModuleKeyname) === false) {
|
|
50
|
+
this.stackedLogs[CommonModuleKeyname] = [];
|
|
51
|
+
}
|
|
52
|
+
if (traceId && this.stackedLogs.hasOwnProperty(traceId) === false) {
|
|
53
|
+
this.stackedLogs[traceId] = (_a = this.stackedLogs[CommonModuleKeyname]) !== null && _a !== void 0 ? _a : [];
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
addStackedLog(log) {
|
|
57
|
+
var _a;
|
|
58
|
+
const stackedLogsKey = (_a = log.traceId) !== null && _a !== void 0 ? _a : CommonModuleKeyname;
|
|
59
|
+
// Push the log at the end of the array
|
|
60
|
+
this.stackedLogs[stackedLogsKey].push(log);
|
|
61
|
+
// If the stacked logs is already at the maximum number of logs, we delete the first log.
|
|
62
|
+
if (this.stackedLogs[stackedLogsKey].length >= this.numberOfStackedLogs) {
|
|
63
|
+
do {
|
|
64
|
+
this.stackedLogs[stackedLogsKey].shift();
|
|
65
|
+
} while (this.stackedLogs[stackedLogsKey].length > this.numberOfStackedLogs);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
outputStackedLogs(traceId) {
|
|
69
|
+
for (const log of this.stackedLogs[CommonModuleKeyname]) {
|
|
70
|
+
this.log(log);
|
|
71
|
+
}
|
|
72
|
+
if (traceId === undefined || this.stackedLogs.hasOwnProperty(traceId) === false) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
for (const log of this.stackedLogs[traceId]) {
|
|
76
|
+
this.log(log);
|
|
77
|
+
}
|
|
78
|
+
this.clearStackedLogs(traceId);
|
|
79
|
+
}
|
|
80
|
+
clearStackedLogs(traceId) {
|
|
81
|
+
this.stackedLogs[CommonModuleKeyname] = [];
|
|
82
|
+
if (traceId === undefined || this.stackedLogs.hasOwnProperty(traceId) === false) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
this.stackedLogs[traceId] = [];
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=base.logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base.logger.js","sourceRoot":"","sources":["../../../../src/loggers/base.logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,24 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
|
-
import { inject, injectable } from "tsyringe";
|
|
13
|
+
import { inject, injectable, singleton } from "tsyringe";
|
|
14
14
|
import { SeverityEnum } from "../enums/severity.enum";
|
|
15
15
|
import { Readable } from "stream";
|
|
16
|
-
import {
|
|
17
|
-
import { ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
|
|
16
|
+
import { moduleScoped, ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
|
|
18
17
|
import { OutputModeEnum } from "../enums/output-mode.enum";
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
this.logInfoDepthConfiguration = logInfoDepthConfiguration;
|
|
25
|
-
this.logWarningDepthConfiguration = logWarningDepthConfiguration;
|
|
26
|
-
this.logErrorDepthConfiguration = logErrorDepthConfiguration;
|
|
27
|
-
this.logCriticalDepthConfiguration = logCriticalDepthConfiguration;
|
|
28
|
-
this.consoleLoggerActivated = consoleLoggerActivated;
|
|
29
|
-
this.consoleLoggerOutputMode = consoleLoggerOutputMode;
|
|
30
|
-
this.stackedLogs = [];
|
|
18
|
+
import { LoggingModuleKeyname } from "../logging.module.keyname";
|
|
19
|
+
import { BaseLogger } from "./base.logger";
|
|
20
|
+
let ConsoleLogger = class ConsoleLogger extends BaseLogger {
|
|
21
|
+
constructor(numberOfStackedLogs, logSeverityLevelConfiguration, logDebugDepthConfiguration, logInfoDepthConfiguration, logWarningDepthConfiguration, logErrorDepthConfiguration, logCriticalDepthConfiguration, isActive, outputMode) {
|
|
22
|
+
super(numberOfStackedLogs, logSeverityLevelConfiguration, logDebugDepthConfiguration, logInfoDepthConfiguration, logWarningDepthConfiguration, logErrorDepthConfiguration, logCriticalDepthConfiguration, isActive, outputMode);
|
|
31
23
|
this.initialize();
|
|
32
24
|
}
|
|
33
25
|
initialize() {
|
|
@@ -43,23 +35,6 @@ let ConsoleLogger = class ConsoleLogger {
|
|
|
43
35
|
});
|
|
44
36
|
}
|
|
45
37
|
}
|
|
46
|
-
isActive() {
|
|
47
|
-
return this.consoleLoggerActivated;
|
|
48
|
-
}
|
|
49
|
-
outputLog(log) {
|
|
50
|
-
switch (log.severity) {
|
|
51
|
-
case SeverityEnum.Debug:
|
|
52
|
-
return Utils.outputLog(log, this.consoleLoggerOutputMode, this.logDebugDepthConfiguration);
|
|
53
|
-
case SeverityEnum.Info:
|
|
54
|
-
return Utils.outputLog(log, this.consoleLoggerOutputMode, this.logInfoDepthConfiguration);
|
|
55
|
-
case SeverityEnum.Warning:
|
|
56
|
-
return Utils.outputLog(log, this.consoleLoggerOutputMode, this.logWarningDepthConfiguration);
|
|
57
|
-
case SeverityEnum.Error:
|
|
58
|
-
return Utils.outputLog(log, this.consoleLoggerOutputMode, this.logErrorDepthConfiguration);
|
|
59
|
-
case SeverityEnum.Critical:
|
|
60
|
-
return Utils.outputLog(log, this.consoleLoggerOutputMode, this.logCriticalDepthConfiguration);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
38
|
log(log) {
|
|
64
39
|
const outputLog = this.outputLog(log);
|
|
65
40
|
switch (log.severity) {
|
|
@@ -80,35 +55,10 @@ let ConsoleLogger = class ConsoleLogger {
|
|
|
80
55
|
break;
|
|
81
56
|
}
|
|
82
57
|
}
|
|
83
|
-
captureLog(log) {
|
|
84
|
-
if (log.severity < this.logSeverityLevelConfiguration) {
|
|
85
|
-
// We still add a log to the stack to ensure that when there's an error, we log everything.
|
|
86
|
-
this.addStackedLog(log);
|
|
87
|
-
return;
|
|
88
|
-
}
|
|
89
|
-
//todo do we really want to always print the stacked logs ?
|
|
90
|
-
this.outputStackedLogs();
|
|
91
|
-
this.log(log);
|
|
92
|
-
}
|
|
93
|
-
addStackedLog(log) {
|
|
94
|
-
// Push the log at the end of the array
|
|
95
|
-
this.stackedLogs.push(log);
|
|
96
|
-
// If the stacked logs is already at the maximum number of logs, we delete the first log.
|
|
97
|
-
if (this.stackedLogs.length >= this.numberOfStackedLogs) {
|
|
98
|
-
this.stackedLogs.shift();
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
outputStackedLogs() {
|
|
102
|
-
for (const log of this.stackedLogs) {
|
|
103
|
-
this.log(log);
|
|
104
|
-
}
|
|
105
|
-
this.clearStackedLogs();
|
|
106
|
-
}
|
|
107
|
-
clearStackedLogs() {
|
|
108
|
-
this.stackedLogs = [];
|
|
109
|
-
}
|
|
110
58
|
};
|
|
111
59
|
ConsoleLogger = __decorate([
|
|
60
|
+
moduleScoped(LoggingModuleKeyname),
|
|
61
|
+
singleton(),
|
|
112
62
|
tag(ServiceDefinitionTagEnum.Logger),
|
|
113
63
|
injectable(),
|
|
114
64
|
__param(0, inject("%pristine.logging.numberOfStackedLogs%")),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.logger.js","sourceRoot":"","sources":["../../../../src/loggers/console.logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"console.logger.js","sourceRoot":"","sources":["../../../../src/loggers/console.logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,25 +10,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
|
-
import { inject, injectable } from "tsyringe";
|
|
13
|
+
import { inject, injectable, singleton } from "tsyringe";
|
|
14
14
|
import { SeverityEnum } from "../enums/severity.enum";
|
|
15
15
|
import { Readable } from "stream";
|
|
16
|
-
import {
|
|
17
|
-
import { ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
|
|
16
|
+
import { moduleScoped, ServiceDefinitionTagEnum, tag } from "@pristine-ts/common";
|
|
18
17
|
import fs from 'fs';
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
this.logWarningDepthConfiguration = logWarningDepthConfiguration;
|
|
26
|
-
this.logErrorDepthConfiguration = logErrorDepthConfiguration;
|
|
27
|
-
this.logCriticalDepthConfiguration = logCriticalDepthConfiguration;
|
|
28
|
-
this.fileLoggerActivated = fileLoggerActivated;
|
|
18
|
+
import { LoggingModuleKeyname } from "../logging.module.keyname";
|
|
19
|
+
import { OutputModeEnum } from "../enums/output-mode.enum";
|
|
20
|
+
import { BaseLogger } from "./base.logger";
|
|
21
|
+
let FileLogger = class FileLogger extends BaseLogger {
|
|
22
|
+
constructor(numberOfStackedLogs, logSeverityLevelConfiguration, logDebugDepthConfiguration, logInfoDepthConfiguration, logWarningDepthConfiguration, logErrorDepthConfiguration, logCriticalDepthConfiguration, isActive, outputMode, fileLoggerPretty, filePath) {
|
|
23
|
+
super(numberOfStackedLogs, logSeverityLevelConfiguration, logDebugDepthConfiguration, logInfoDepthConfiguration, logWarningDepthConfiguration, logErrorDepthConfiguration, logCriticalDepthConfiguration, isActive, outputMode, fileLoggerPretty ? 2 : 0);
|
|
29
24
|
this.filePath = filePath;
|
|
30
|
-
this.fileLoggerPretty = fileLoggerPretty;
|
|
31
|
-
this.stackedLogs = [];
|
|
32
25
|
this.initialize();
|
|
33
26
|
}
|
|
34
27
|
initialize() {
|
|
@@ -45,57 +38,30 @@ let FileLogger = class FileLogger {
|
|
|
45
38
|
});
|
|
46
39
|
}
|
|
47
40
|
}
|
|
48
|
-
isActive() {
|
|
49
|
-
return this.fileLoggerActivated;
|
|
50
|
-
}
|
|
51
41
|
log(log) {
|
|
42
|
+
const outputLog = this.outputLog(log) + ";\n";
|
|
52
43
|
switch (log.severity) {
|
|
53
44
|
case SeverityEnum.Debug:
|
|
54
|
-
this.writableStream.write(
|
|
45
|
+
this.writableStream.write(outputLog);
|
|
55
46
|
break;
|
|
56
47
|
case SeverityEnum.Info:
|
|
57
|
-
this.writableStream.write(
|
|
48
|
+
this.writableStream.write(outputLog);
|
|
58
49
|
break;
|
|
59
50
|
case SeverityEnum.Warning:
|
|
60
|
-
this.writableStream.write(
|
|
51
|
+
this.writableStream.write(outputLog);
|
|
61
52
|
break;
|
|
62
53
|
case SeverityEnum.Error:
|
|
63
|
-
this.writableStream.write(
|
|
54
|
+
this.writableStream.write(outputLog);
|
|
64
55
|
break;
|
|
65
56
|
case SeverityEnum.Critical:
|
|
66
|
-
this.writableStream.write(
|
|
57
|
+
this.writableStream.write(outputLog);
|
|
67
58
|
break;
|
|
68
59
|
}
|
|
69
60
|
}
|
|
70
|
-
captureLog(log) {
|
|
71
|
-
if (log.severity < this.logSeverityLevelConfiguration) {
|
|
72
|
-
// We still add a log to the stack to ensure that when there's an error, we log everything.
|
|
73
|
-
this.addStackedLog(log);
|
|
74
|
-
return;
|
|
75
|
-
}
|
|
76
|
-
//todo do we really want to always print the stacked logs ?
|
|
77
|
-
this.outputStackedLogs();
|
|
78
|
-
this.log(log);
|
|
79
|
-
}
|
|
80
|
-
addStackedLog(log) {
|
|
81
|
-
// Push the log at the end of the array
|
|
82
|
-
this.stackedLogs.push(log);
|
|
83
|
-
// If the stacked logs is already at the maximum number of logs, we delete the first log.
|
|
84
|
-
if (this.stackedLogs.length >= this.numberOfStackedLogs) {
|
|
85
|
-
this.stackedLogs.shift();
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
outputStackedLogs() {
|
|
89
|
-
for (const log of this.stackedLogs) {
|
|
90
|
-
this.log(log);
|
|
91
|
-
}
|
|
92
|
-
this.clearStackedLogs();
|
|
93
|
-
}
|
|
94
|
-
clearStackedLogs() {
|
|
95
|
-
this.stackedLogs = [];
|
|
96
|
-
}
|
|
97
61
|
};
|
|
98
62
|
FileLogger = __decorate([
|
|
63
|
+
moduleScoped(LoggingModuleKeyname),
|
|
64
|
+
singleton(),
|
|
99
65
|
tag(ServiceDefinitionTagEnum.Logger),
|
|
100
66
|
injectable(),
|
|
101
67
|
__param(0, inject("%pristine.logging.numberOfStackedLogs%")),
|
|
@@ -106,9 +72,10 @@ FileLogger = __decorate([
|
|
|
106
72
|
__param(5, inject("%pristine.logging.logErrorDepthConfiguration%")),
|
|
107
73
|
__param(6, inject("%pristine.logging.logCriticalDepthConfiguration%")),
|
|
108
74
|
__param(7, inject("%pristine.logging.fileLoggerActivated%")),
|
|
109
|
-
__param(8, inject("%pristine.logging.
|
|
75
|
+
__param(8, inject("%pristine.logging.fileLoggerOutputMode%")),
|
|
110
76
|
__param(9, inject("%pristine.logging.fileLoggerPretty%")),
|
|
111
|
-
|
|
77
|
+
__param(10, inject("%pristine.logging.filePath%")),
|
|
78
|
+
__metadata("design:paramtypes", [Number, Number, Number, Number, Number, Number, Number, Boolean, String, Boolean, String])
|
|
112
79
|
], FileLogger);
|
|
113
80
|
export { FileLogger };
|
|
114
81
|
//# sourceMappingURL=file.logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.logger.js","sourceRoot":"","sources":["../../../../src/loggers/file.logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"file.logger.js","sourceRoot":"","sources":["../../../../src/loggers/file.logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { LoggingModuleKeyname } from "./logging.module.keyname";
|
|
2
2
|
import { BooleanResolver, ConfigurationModule, EnumResolver, EnvironmentVariableResolver, NumberResolver } from "@pristine-ts/configuration";
|
|
3
3
|
import { OutputModeEnum } from "./enums/output-mode.enum";
|
|
4
|
+
import { CommonModule } from "@pristine-ts/common";
|
|
4
5
|
export * from "./enums/enums";
|
|
5
6
|
export * from "./handlers/handlers";
|
|
6
7
|
export * from "./interfaces/interfaces";
|
|
@@ -21,7 +22,7 @@ export const LoggingModule = {
|
|
|
21
22
|
},
|
|
22
23
|
{
|
|
23
24
|
parameterName: LoggingModuleKeyname + ".logSeverityLevelConfiguration",
|
|
24
|
-
defaultValue:
|
|
25
|
+
defaultValue: 1,
|
|
25
26
|
isRequired: false,
|
|
26
27
|
defaultResolvers: [
|
|
27
28
|
new NumberResolver(new EnvironmentVariableResolver("PRISTINE_LOGGING_LOG_SEVERITY_LEVEL_CONFIGURATION")),
|
|
@@ -83,6 +84,14 @@ export const LoggingModule = {
|
|
|
83
84
|
new EnumResolver(new EnvironmentVariableResolver("PRISTINE_LOGGING_CONSOLE_LOGGER_OUTPUT_MODE"), OutputModeEnum),
|
|
84
85
|
]
|
|
85
86
|
},
|
|
87
|
+
{
|
|
88
|
+
parameterName: LoggingModuleKeyname + ".fileLoggerOutputMode",
|
|
89
|
+
defaultValue: OutputModeEnum.Json,
|
|
90
|
+
isRequired: false,
|
|
91
|
+
defaultResolvers: [
|
|
92
|
+
new EnumResolver(new EnvironmentVariableResolver("PRISTINE_LOGGING_FILE_LOGGER_OUTPUT_MODE"), OutputModeEnum),
|
|
93
|
+
]
|
|
94
|
+
},
|
|
86
95
|
{
|
|
87
96
|
parameterName: LoggingModuleKeyname + ".fileLoggerActivated",
|
|
88
97
|
defaultValue: false,
|
|
@@ -109,6 +118,7 @@ export const LoggingModule = {
|
|
|
109
118
|
},
|
|
110
119
|
],
|
|
111
120
|
importModules: [
|
|
121
|
+
CommonModule,
|
|
112
122
|
ConfigurationModule,
|
|
113
123
|
],
|
|
114
124
|
providerRegistrations: []
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.module.js","sourceRoot":"","sources":["../../../src/logging.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logging.module.js","sourceRoot":"","sources":["../../../src/logging.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diagnostics.model.js","sourceRoot":"","sources":["../../../../src/models/diagnostics.model.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAgB;IAA7B;QAEI,eAAU,GAKJ,EAAE,CAAC;IAOb,CAAC;CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.model.js","sourceRoot":"","sources":["../../../../src/models/log.model.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,QAAQ;IAArB;
|
|
1
|
+
{"version":3,"file":"log.model.js","sourceRoot":"","sources":["../../../../src/models/log.model.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,QAAQ;IAArB;QAGE,SAAI,GAAS,IAAI,IAAI,EAAE,CAAC;QACxB,WAAM,GAAW,aAAa,CAAC;IAIjC,CAAC;CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/models/models.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/models/models.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC"}
|