@spinajs/log 2.0.110 → 2.0.111
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/cjs/bootstrap.d.ts.map +1 -1
- package/lib/cjs/bootstrap.js +4 -2
- package/lib/cjs/bootstrap.js.map +1 -1
- package/lib/cjs/index.d.ts +0 -1
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +0 -1
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/log.d.ts +2 -17
- package/lib/cjs/log.d.ts.map +1 -1
- package/lib/cjs/log.js +14 -59
- package/lib/cjs/log.js.map +1 -1
- package/lib/cjs/targets/FileTarget.d.ts +2 -2
- package/lib/cjs/targets/FileTarget.d.ts.map +1 -1
- package/lib/cjs/targets/FileTarget.js +2 -3
- package/lib/cjs/targets/FileTarget.js.map +1 -1
- package/lib/mjs/bootstrap.d.ts.map +1 -1
- package/lib/mjs/bootstrap.js +3 -1
- package/lib/mjs/bootstrap.js.map +1 -1
- package/lib/mjs/index.d.ts +0 -1
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +0 -1
- package/lib/mjs/index.js.map +1 -1
- package/lib/mjs/log.d.ts +2 -17
- package/lib/mjs/log.d.ts.map +1 -1
- package/lib/mjs/log.js +8 -53
- package/lib/mjs/log.js.map +1 -1
- package/lib/mjs/targets/FileTarget.d.ts +2 -2
- package/lib/mjs/targets/FileTarget.d.ts.map +1 -1
- package/lib/mjs/targets/FileTarget.js +2 -3
- package/lib/mjs/targets/FileTarget.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +6 -6
- package/lib/cjs/decorators.d.ts +0 -7
- package/lib/cjs/decorators.d.ts.map +0 -1
- package/lib/cjs/decorators.js +0 -39
- package/lib/cjs/decorators.js.map +0 -1
- package/lib/mjs/decorators.d.ts +0 -7
- package/lib/mjs/decorators.d.ts.map +0 -1
- package/lib/mjs/decorators.js +0 -35
- package/lib/mjs/decorators.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,YAAY,EAAM,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,YAAY,EAAM,MAAM,aAAa,CAAC;AAK3D,qBACa,cAAe,SAAQ,YAAY;IACvC,SAAS,IAAI,IAAI;CAsCzB"}
|
package/lib/cjs/bootstrap.js
CHANGED
|
@@ -12,11 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.LogBotstrapper = void 0;
|
|
13
13
|
const configuration_1 = require("@spinajs/configuration");
|
|
14
14
|
const di_1 = require("@spinajs/di");
|
|
15
|
+
const log_common_1 = require("@spinajs/log-common");
|
|
15
16
|
const log_js_1 = require("./log.js");
|
|
16
17
|
const log_configuration_js_1 = __importDefault(require("./schemas/log.configuration.js"));
|
|
17
18
|
let LogBotstrapper = class LogBotstrapper extends di_1.Bootstrapper {
|
|
18
19
|
bootstrap() {
|
|
19
20
|
di_1.DI.register(log_configuration_js_1.default).asValue("__configurationSchema__");
|
|
21
|
+
di_1.DI.register(log_js_1.FrameworkLogger).as(log_common_1.Log);
|
|
20
22
|
// check if we run tests,
|
|
21
23
|
// hook for uncaughtException causes to not showing
|
|
22
24
|
// mocha errors in console
|
|
@@ -26,7 +28,7 @@ let LogBotstrapper = class LogBotstrapper extends di_1.Bootstrapper {
|
|
|
26
28
|
// so log to default log
|
|
27
29
|
// if not log to console
|
|
28
30
|
if (di_1.DI.has(configuration_1.Configuration)) {
|
|
29
|
-
const log = di_1.DI.resolve(
|
|
31
|
+
const log = di_1.DI.resolve(log_common_1.Log, ["process"]);
|
|
30
32
|
log.fatal(err, "Unhandled exception occured");
|
|
31
33
|
}
|
|
32
34
|
else {
|
|
@@ -38,7 +40,7 @@ let LogBotstrapper = class LogBotstrapper extends di_1.Bootstrapper {
|
|
|
38
40
|
// so log to default log
|
|
39
41
|
// if not log to console
|
|
40
42
|
if (di_1.DI.has(configuration_1.Configuration)) {
|
|
41
|
-
const log = di_1.DI.resolve(
|
|
43
|
+
const log = di_1.DI.resolve(log_common_1.Log, ["process"]);
|
|
42
44
|
log.fatal(reason, "Unhandled rejection at Promise %s", p);
|
|
43
45
|
}
|
|
44
46
|
else {
|
package/lib/cjs/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAuD;AACvD,oCAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAuD;AACvD,oCAA2D;AAC3D,oDAA0C;AAC1C,qCAA2C;AAC3C,0FAAkE;AAG3D,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,iBAAY;IACvC,SAAS;QACd,OAAE,CAAC,QAAQ,CAAC,8BAAoB,CAAC,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QACrE,OAAE,CAAC,QAAQ,CAAC,wBAAe,CAAC,CAAC,EAAE,CAAC,gBAAG,CAAC,CAAC;QAErC,yBAAyB;QACzB,mDAAmD;QACnD,0BAA0B;QAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;YACxB,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE;gBACtC,sFAAsF;gBACtF,wBAAwB;gBACxB,wBAAwB;gBACxB,IAAI,OAAE,CAAC,GAAG,CAAC,6BAAa,CAAC,EAAE;oBACzB,MAAM,GAAG,GAAG,OAAE,CAAC,OAAO,CAAC,gBAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;oBACzC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAC;iBAC/C;qBAAM;oBACL,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAC7D,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,sFAAsF;gBACtF,wBAAwB;gBACxB,wBAAwB;gBACxB,IAAI,OAAE,CAAC,GAAG,CAAC,6BAAa,CAAC,EAAE;oBACzB,MAAM,GAAG,GAAG,OAAE,CAAC,OAAO,CAAC,gBAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;oBACzC,GAAG,CAAC,KAAK,CAAC,MAAe,EAAE,mCAAmC,EAAE,CAAC,CAAC,CAAC;iBACpE;qBAAM;oBACL,OAAO,CAAC,KAAK,CACX,6CAA6C;wBAC3C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACzB,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CACF,CAAA;AAvCY,cAAc;IAD1B,IAAA,eAAU,EAAC,iBAAY,CAAC;GACZ,cAAc,CAuC1B;AAvCY,wCAAc"}
|
package/lib/cjs/index.d.ts
CHANGED
package/lib/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC"}
|
package/lib/cjs/index.js
CHANGED
|
@@ -17,6 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("@spinajs/log-common"), exports);
|
|
18
18
|
__exportStar(require("./targets/index.js"), exports);
|
|
19
19
|
__exportStar(require("./log.js"), exports);
|
|
20
|
-
__exportStar(require("./decorators.js"), exports);
|
|
21
20
|
__exportStar(require("./bootstrap.js"), exports);
|
|
22
21
|
//# sourceMappingURL=index.js.map
|
package/lib/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,qDAAmC;AACnC,2CAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,qDAAmC;AACnC,2CAAyB;AACzB,iDAA+B"}
|
package/lib/cjs/log.d.ts
CHANGED
|
@@ -1,25 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ILogOptions, ILogRule, ILogEntry, LogVariables, ILog, ILogTargetDesc } from "@spinajs/log-common";
|
|
1
|
+
import { ILogEntry, Log } from "@spinajs/log-common";
|
|
3
2
|
/**
|
|
4
3
|
* Default log implementation interface. Taken from bunyan. Feel free to implement own.
|
|
5
4
|
*/
|
|
6
|
-
export declare class
|
|
5
|
+
export declare class FrameworkLogger extends Log {
|
|
7
6
|
Name: string;
|
|
8
7
|
protected Parent?: Log;
|
|
9
|
-
static Loggers: Map<string, Log>;
|
|
10
|
-
static InternalLoggers: Map<string, Log>;
|
|
11
|
-
Timers: Map<string, Date>;
|
|
12
|
-
Targets: ILogTargetDesc[];
|
|
13
|
-
static clearLoggers(): Promise<Promise<void>[]>;
|
|
14
|
-
protected static AttachedToExitEvents: boolean;
|
|
15
|
-
protected Options: ILogOptions;
|
|
16
|
-
protected Rules: ILogRule[];
|
|
17
|
-
protected Variables: Record<string, any>;
|
|
18
|
-
protected Container: Container;
|
|
19
8
|
constructor(Name: string, variables?: Record<string, unknown>, Parent?: Log);
|
|
20
|
-
addVariable(name: string, value: unknown): void;
|
|
21
|
-
timeStart(name: string): void;
|
|
22
|
-
timeEnd(name: string): number;
|
|
23
9
|
resolve(): void;
|
|
24
10
|
trace(message: string, ...args: any[]): void;
|
|
25
11
|
trace(err: Error, message: string, ...args: any[]): void;
|
|
@@ -38,7 +24,6 @@ export declare class Log extends SyncService implements ILog {
|
|
|
38
24
|
success(message: string, ...args: any[]): void;
|
|
39
25
|
success(err: Error, message: string, ...args: any[]): void;
|
|
40
26
|
write(entry: ILogEntry): Promise<PromiseSettledResult<void>[]>;
|
|
41
|
-
child(name: string, variables?: LogVariables): Log;
|
|
42
27
|
protected resolveLogTargets(): void;
|
|
43
28
|
protected matchRulesToLogger(): void;
|
|
44
29
|
}
|
package/lib/cjs/log.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,SAAS,EAKT,GAAG,EACJ,MAAM,qBAAqB,CAAC;AA8C7B;;GAEG;AACH,qBACa,eAAgB,SAAQ,GAAG;IAG7B,IAAI,EAAE,MAAM;IAEnB,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG;gBAFf,IAAI,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzB,MAAM,CAAC,EAAE,GAAG;IAOjB,OAAO,IAAI,IAAI;IA2Bf,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC3C,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASvD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC3C,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASvD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC/C,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAS3D,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC9C,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAS1D,KAAK,CAAC,KAAK,EAAE,SAAS;IAkB7B,SAAS,CAAC,iBAAiB;IAyB3B,SAAS,CAAC,kBAAkB;CAQ7B"}
|
package/lib/cjs/log.js
CHANGED
|
@@ -11,9 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
|
-
var Log_1;
|
|
15
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.
|
|
15
|
+
exports.FrameworkLogger = void 0;
|
|
17
16
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
18
17
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
19
18
|
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
@@ -41,40 +40,13 @@ function wrapWrite(level) {
|
|
|
41
40
|
/**
|
|
42
41
|
* Default log implementation interface. Taken from bunyan. Feel free to implement own.
|
|
43
42
|
*/
|
|
44
|
-
let
|
|
45
|
-
static clearLoggers() {
|
|
46
|
-
return Promise.all([...Log_1.Loggers.values()].map((l) => l.dispose())).then(() => {
|
|
47
|
-
Log_1.Loggers.clear();
|
|
48
|
-
}).then(() => {
|
|
49
|
-
return [...Log_1.InternalLoggers.values()].map((l) => l.dispose());
|
|
50
|
-
});
|
|
51
|
-
}
|
|
43
|
+
let FrameworkLogger = class FrameworkLogger extends log_common_1.Log {
|
|
52
44
|
constructor(Name, variables, Parent) {
|
|
53
45
|
super();
|
|
54
46
|
this.Name = Name;
|
|
55
47
|
this.Parent = Parent;
|
|
56
|
-
this.Timers = new Map();
|
|
57
|
-
this.Variables = {};
|
|
58
48
|
this.Variables = variables ?? {};
|
|
59
49
|
}
|
|
60
|
-
addVariable(name, value) {
|
|
61
|
-
this.Variables[`${name}`] = value;
|
|
62
|
-
}
|
|
63
|
-
timeStart(name) {
|
|
64
|
-
if (this.Timers.has(name)) {
|
|
65
|
-
return;
|
|
66
|
-
}
|
|
67
|
-
this.Timers.set(name, new Date());
|
|
68
|
-
}
|
|
69
|
-
timeEnd(name) {
|
|
70
|
-
if (this.Timers.has(name)) {
|
|
71
|
-
const cTime = new Date();
|
|
72
|
-
const diff = cTime.getTime() - this.Timers.get(name).getTime();
|
|
73
|
-
this.Timers.delete(name);
|
|
74
|
-
return diff;
|
|
75
|
-
}
|
|
76
|
-
return 0;
|
|
77
|
-
}
|
|
78
50
|
resolve() {
|
|
79
51
|
const config = this.Container.get(configuration_1.Configuration);
|
|
80
52
|
if (!config) {
|
|
@@ -92,7 +64,7 @@ let Log = Log_1 = class Log extends di_1.SyncService {
|
|
|
92
64
|
this.matchRulesToLogger();
|
|
93
65
|
this.resolveLogTargets();
|
|
94
66
|
super.resolve();
|
|
95
|
-
|
|
67
|
+
log_common_1.Log.Loggers.set(this.Name, this);
|
|
96
68
|
}
|
|
97
69
|
trace(err, message, ...args) {
|
|
98
70
|
wrapWrite.apply(this, [log_common_1.LogLevel.Trace])(err, message, ...args);
|
|
@@ -128,16 +100,6 @@ let Log = Log_1 = class Log extends di_1.SyncService {
|
|
|
128
100
|
}));
|
|
129
101
|
}
|
|
130
102
|
}
|
|
131
|
-
child(name, variables) {
|
|
132
|
-
return di_1.DI.resolve(Log_1, [
|
|
133
|
-
`${this.Name}.${name}`,
|
|
134
|
-
{
|
|
135
|
-
...this.Variables,
|
|
136
|
-
...variables,
|
|
137
|
-
},
|
|
138
|
-
this,
|
|
139
|
-
]);
|
|
140
|
-
}
|
|
141
103
|
resolveLogTargets() {
|
|
142
104
|
this.Targets = this.Rules.map((r) => {
|
|
143
105
|
const found = this.Options.targets.filter((t) => {
|
|
@@ -165,28 +127,21 @@ let Log = Log_1 = class Log extends di_1.SyncService {
|
|
|
165
127
|
});
|
|
166
128
|
}
|
|
167
129
|
};
|
|
168
|
-
|
|
169
|
-
Log.InternalLoggers = new Map();
|
|
170
|
-
Log.AttachedToExitEvents = false;
|
|
171
|
-
__decorate([
|
|
172
|
-
(0, di_1.Autoinject)(),
|
|
173
|
-
__metadata("design:type", di_1.Container)
|
|
174
|
-
], Log.prototype, "Container", void 0);
|
|
175
|
-
Log = Log_1 = __decorate([
|
|
130
|
+
FrameworkLogger = __decorate([
|
|
176
131
|
(0, di_1.NewInstance)(),
|
|
177
|
-
__metadata("design:paramtypes", [String, Object, Log])
|
|
178
|
-
],
|
|
179
|
-
exports.
|
|
132
|
+
__metadata("design:paramtypes", [String, Object, log_common_1.Log])
|
|
133
|
+
], FrameworkLogger);
|
|
134
|
+
exports.FrameworkLogger = FrameworkLogger;
|
|
180
135
|
const logFactoryFunction = (container, logName) => {
|
|
181
|
-
if (Log.Loggers.has(logName)) {
|
|
182
|
-
return Log.Loggers.get(logName);
|
|
136
|
+
if (log_common_1.Log.Loggers.has(logName)) {
|
|
137
|
+
return log_common_1.Log.Loggers.get(logName);
|
|
183
138
|
}
|
|
184
139
|
if (!di_1.DI.has(configuration_1.Configuration)) {
|
|
185
|
-
if (Log.InternalLoggers.has(logName)) {
|
|
186
|
-
return Log.InternalLoggers.get(logName);
|
|
140
|
+
if (log_common_1.Log.InternalLoggers.has(logName)) {
|
|
141
|
+
return log_common_1.Log.InternalLoggers.get(logName);
|
|
187
142
|
}
|
|
188
143
|
const internalLogger = container.resolve(internal_logger_1.InternalLoggerProxy, [logName]);
|
|
189
|
-
Log.InternalLoggers.set(logName, this);
|
|
144
|
+
log_common_1.Log.InternalLoggers.set(logName, this);
|
|
190
145
|
return internalLogger;
|
|
191
146
|
}
|
|
192
147
|
return container.resolve("__logImplementation__", [logName]);
|
|
@@ -199,9 +154,9 @@ di_1.DI.register(logFactoryFunction).as("__log__");
|
|
|
199
154
|
// register log factory function as Log class
|
|
200
155
|
// this way we can create or return already created
|
|
201
156
|
// log objects
|
|
202
|
-
di_1.DI.register(logFactoryFunction).as(Log);
|
|
157
|
+
di_1.DI.register(logFactoryFunction).as(log_common_1.Log);
|
|
203
158
|
// register Log class as string literal
|
|
204
159
|
// so we can resolve Log class
|
|
205
160
|
// it should not be used in production code
|
|
206
|
-
di_1.DI.register(
|
|
161
|
+
di_1.DI.register(FrameworkLogger).as("__logImplementation__");
|
|
207
162
|
//# sourceMappingURL=log.js.map
|
package/lib/cjs/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import fs from "fs";
|
|
4
4
|
import { IInstanceCheck } from "@spinajs/di";
|
|
5
|
-
import { IFileTargetOptions,
|
|
5
|
+
import { IFileTargetOptions, Log, ILogEntry, LogTarget } from "@spinajs/log-common";
|
|
6
6
|
declare enum FileTargetStatus {
|
|
7
7
|
WRITTING = 0,
|
|
8
8
|
PENDING = 1,
|
|
9
9
|
IDLE = 2
|
|
10
10
|
}
|
|
11
11
|
export declare class FileTarget extends LogTarget<IFileTargetOptions> implements IInstanceCheck {
|
|
12
|
-
protected Log:
|
|
12
|
+
protected Log: Log;
|
|
13
13
|
LogDirPath: string;
|
|
14
14
|
ArchiveDirPath: string;
|
|
15
15
|
protected WriteStream: fs.WriteStream;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/FileTarget.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAOpB,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"FileTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/FileTarget.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AAOpB,OAAO,EAAE,cAAc,EAAgC,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAU,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAI5F,aAAK,gBAAgB;IACnB,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAID,qBAEa,UAAW,SAAQ,SAAS,CAAC,kBAAkB,CAAE,YAAW,cAAc;IAErF,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEZ,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IAE9B,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC;IACtC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM;IAChC,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,CAAM;IAErC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC;IACrC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC;IAEnC,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAyB;IAC3D,SAAS,CAAC,aAAa,EAAE,gBAAgB,CAAyB;IAElE,iBAAiB,CAAC,eAAe,EAAE,kBAAkB,EAAE,GAAG,OAAO;IAI1D,OAAO;IA+Dd,SAAS,CAAC,KAAK;IA0BF,OAAO;IAYP,KAAK,CAAC,IAAI,EAAE,SAAS;IA2BlC,SAAS,CAAC,OAAO;CAyGlB"}
|
|
@@ -47,7 +47,6 @@ const configuration_1 = require("@spinajs/configuration");
|
|
|
47
47
|
const exceptions_1 = require("@spinajs/exceptions");
|
|
48
48
|
const di_1 = require("@spinajs/di");
|
|
49
49
|
const log_common_1 = require("@spinajs/log-common");
|
|
50
|
-
const decorators_js_1 = require("./../decorators.js");
|
|
51
50
|
const lodash_1 = __importDefault(require("lodash"));
|
|
52
51
|
var FileTargetStatus;
|
|
53
52
|
(function (FileTargetStatus) {
|
|
@@ -254,8 +253,8 @@ let FileTarget = class FileTarget extends log_common_1.LogTarget {
|
|
|
254
253
|
}
|
|
255
254
|
};
|
|
256
255
|
__decorate([
|
|
257
|
-
(0,
|
|
258
|
-
__metadata("design:type",
|
|
256
|
+
(0, log_common_1.Logger)("LogFileTarget"),
|
|
257
|
+
__metadata("design:type", log_common_1.Log)
|
|
259
258
|
], FileTarget.prototype, "Log", void 0);
|
|
260
259
|
FileTarget = __decorate([
|
|
261
260
|
(0, di_1.PerInstanceCheck)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileTarget.js","sourceRoot":"","sources":["../../../src/targets/FileTarget.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD,2BAAyB;AACzB,4CAAoB;AACpB,2CAA6B;AAC7B,gDAAwB;AACxB,2CAA6B;AAC7B,mCAAkC;AAClC,0DAAgD;AAChD,oDAAoD;AACpD,oCAA2E;AAC3E,
|
|
1
|
+
{"version":3,"file":"FileTarget.js","sourceRoot":"","sources":["../../../src/targets/FileTarget.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,YAAY,EAAM,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,YAAY,EAAM,MAAM,aAAa,CAAC;AAK3D,qBACa,cAAe,SAAQ,YAAY;IACvC,SAAS,IAAI,IAAI;CAsCzB"}
|
package/lib/mjs/bootstrap.js
CHANGED
|
@@ -6,11 +6,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import { Configuration } from "@spinajs/configuration";
|
|
8
8
|
import { Injectable, Bootstrapper, DI } from "@spinajs/di";
|
|
9
|
-
import { Log } from "
|
|
9
|
+
import { Log } from "@spinajs/log-common";
|
|
10
|
+
import { FrameworkLogger } from "./log.js";
|
|
10
11
|
import CONFIGURATION_SCHEMA from "./schemas/log.configuration.js";
|
|
11
12
|
let LogBotstrapper = class LogBotstrapper extends Bootstrapper {
|
|
12
13
|
bootstrap() {
|
|
13
14
|
DI.register(CONFIGURATION_SCHEMA).asValue("__configurationSchema__");
|
|
15
|
+
DI.register(FrameworkLogger).as(Log);
|
|
14
16
|
// check if we run tests,
|
|
15
17
|
// hook for uncaughtException causes to not showing
|
|
16
18
|
// mocha errors in console
|
package/lib/mjs/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../src/bootstrap.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,oBAAoB,MAAM,gCAAgC,CAAC;AAG3D,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,YAAY;IACvC,SAAS;QACd,EAAE,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;QACrE,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAErC,yBAAyB;QACzB,mDAAmD;QACnD,0BAA0B;QAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;YACxB,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE;gBACtC,sFAAsF;gBACtF,wBAAwB;gBACxB,wBAAwB;gBACxB,IAAI,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;oBACzB,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;oBACzC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,6BAA6B,CAAC,CAAC;iBAC/C;qBAAM;oBACL,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAC7D,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC7C,sFAAsF;gBACtF,wBAAwB;gBACxB,wBAAwB;gBACxB,IAAI,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;oBACzB,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;oBACzC,GAAG,CAAC,KAAK,CAAC,MAAe,EAAE,mCAAmC,EAAE,CAAC,CAAC,CAAC;iBACpE;qBAAM;oBACL,OAAO,CAAC,KAAK,CACX,6CAA6C;wBAC3C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACzB,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CACF,CAAA;AAvCY,cAAc;IAD1B,UAAU,CAAC,YAAY,CAAC;GACZ,cAAc,CAuC1B;SAvCY,cAAc"}
|
package/lib/mjs/index.d.ts
CHANGED
package/lib/mjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC"}
|
package/lib/mjs/index.js
CHANGED
package/lib/mjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC"}
|
package/lib/mjs/log.d.ts
CHANGED
|
@@ -1,25 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ILogOptions, ILogRule, ILogEntry, LogVariables, ILog, ILogTargetDesc } from "@spinajs/log-common";
|
|
1
|
+
import { ILogEntry, Log } from "@spinajs/log-common";
|
|
3
2
|
/**
|
|
4
3
|
* Default log implementation interface. Taken from bunyan. Feel free to implement own.
|
|
5
4
|
*/
|
|
6
|
-
export declare class
|
|
5
|
+
export declare class FrameworkLogger extends Log {
|
|
7
6
|
Name: string;
|
|
8
7
|
protected Parent?: Log;
|
|
9
|
-
static Loggers: Map<string, Log>;
|
|
10
|
-
static InternalLoggers: Map<string, Log>;
|
|
11
|
-
Timers: Map<string, Date>;
|
|
12
|
-
Targets: ILogTargetDesc[];
|
|
13
|
-
static clearLoggers(): Promise<Promise<void>[]>;
|
|
14
|
-
protected static AttachedToExitEvents: boolean;
|
|
15
|
-
protected Options: ILogOptions;
|
|
16
|
-
protected Rules: ILogRule[];
|
|
17
|
-
protected Variables: Record<string, any>;
|
|
18
|
-
protected Container: Container;
|
|
19
8
|
constructor(Name: string, variables?: Record<string, unknown>, Parent?: Log);
|
|
20
|
-
addVariable(name: string, value: unknown): void;
|
|
21
|
-
timeStart(name: string): void;
|
|
22
|
-
timeEnd(name: string): number;
|
|
23
9
|
resolve(): void;
|
|
24
10
|
trace(message: string, ...args: any[]): void;
|
|
25
11
|
trace(err: Error, message: string, ...args: any[]): void;
|
|
@@ -38,7 +24,6 @@ export declare class Log extends SyncService implements ILog {
|
|
|
38
24
|
success(message: string, ...args: any[]): void;
|
|
39
25
|
success(err: Error, message: string, ...args: any[]): void;
|
|
40
26
|
write(entry: ILogEntry): Promise<PromiseSettledResult<void>[]>;
|
|
41
|
-
child(name: string, variables?: LogVariables): Log;
|
|
42
27
|
protected resolveLogTargets(): void;
|
|
43
28
|
protected matchRulesToLogger(): void;
|
|
44
29
|
}
|
package/lib/mjs/log.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,SAAS,EAKT,GAAG,EACJ,MAAM,qBAAqB,CAAC;AA8C7B;;GAEG;AACH,qBACa,eAAgB,SAAQ,GAAG;IAG7B,IAAI,EAAE,MAAM;IAEnB,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG;gBAFf,IAAI,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzB,MAAM,CAAC,EAAE,GAAG;IAOjB,OAAO,IAAI,IAAI;IA2Bf,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC3C,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASvD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC3C,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASvD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC5C,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IASxD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC/C,QAAQ,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAS3D,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAC9C,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAS1D,KAAK,CAAC,KAAK,EAAE,SAAS;IAkB7B,SAAS,CAAC,iBAAiB;IAyB3B,SAAS,CAAC,kBAAkB;CAQ7B"}
|
package/lib/mjs/log.js
CHANGED
|
@@ -7,13 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
var Log_1;
|
|
11
10
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
12
11
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
13
12
|
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
14
13
|
import { Configuration } from "@spinajs/configuration";
|
|
15
|
-
import {
|
|
16
|
-
import { LogLevel, StrToLogLevel, createLogMessageObject, } from "@spinajs/log-common";
|
|
14
|
+
import { DI, NewInstance, } from "@spinajs/di";
|
|
15
|
+
import { LogLevel, StrToLogLevel, createLogMessageObject, Log, } from "@spinajs/log-common";
|
|
17
16
|
import GlobToRegExp from "glob-to-regexp";
|
|
18
17
|
import { InvalidOperation, InvalidOption } from "@spinajs/exceptions";
|
|
19
18
|
import { InternalLoggerProxy } from "@spinajs/internal-logger";
|
|
@@ -35,40 +34,13 @@ function wrapWrite(level) {
|
|
|
35
34
|
/**
|
|
36
35
|
* Default log implementation interface. Taken from bunyan. Feel free to implement own.
|
|
37
36
|
*/
|
|
38
|
-
let
|
|
39
|
-
static clearLoggers() {
|
|
40
|
-
return Promise.all([...Log_1.Loggers.values()].map((l) => l.dispose())).then(() => {
|
|
41
|
-
Log_1.Loggers.clear();
|
|
42
|
-
}).then(() => {
|
|
43
|
-
return [...Log_1.InternalLoggers.values()].map((l) => l.dispose());
|
|
44
|
-
});
|
|
45
|
-
}
|
|
37
|
+
let FrameworkLogger = class FrameworkLogger extends Log {
|
|
46
38
|
constructor(Name, variables, Parent) {
|
|
47
39
|
super();
|
|
48
40
|
this.Name = Name;
|
|
49
41
|
this.Parent = Parent;
|
|
50
|
-
this.Timers = new Map();
|
|
51
|
-
this.Variables = {};
|
|
52
42
|
this.Variables = variables ?? {};
|
|
53
43
|
}
|
|
54
|
-
addVariable(name, value) {
|
|
55
|
-
this.Variables[`${name}`] = value;
|
|
56
|
-
}
|
|
57
|
-
timeStart(name) {
|
|
58
|
-
if (this.Timers.has(name)) {
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
|
-
this.Timers.set(name, new Date());
|
|
62
|
-
}
|
|
63
|
-
timeEnd(name) {
|
|
64
|
-
if (this.Timers.has(name)) {
|
|
65
|
-
const cTime = new Date();
|
|
66
|
-
const diff = cTime.getTime() - this.Timers.get(name).getTime();
|
|
67
|
-
this.Timers.delete(name);
|
|
68
|
-
return diff;
|
|
69
|
-
}
|
|
70
|
-
return 0;
|
|
71
|
-
}
|
|
72
44
|
resolve() {
|
|
73
45
|
const config = this.Container.get(Configuration);
|
|
74
46
|
if (!config) {
|
|
@@ -86,7 +58,7 @@ let Log = Log_1 = class Log extends SyncService {
|
|
|
86
58
|
this.matchRulesToLogger();
|
|
87
59
|
this.resolveLogTargets();
|
|
88
60
|
super.resolve();
|
|
89
|
-
|
|
61
|
+
Log.Loggers.set(this.Name, this);
|
|
90
62
|
}
|
|
91
63
|
trace(err, message, ...args) {
|
|
92
64
|
wrapWrite.apply(this, [LogLevel.Trace])(err, message, ...args);
|
|
@@ -122,16 +94,6 @@ let Log = Log_1 = class Log extends SyncService {
|
|
|
122
94
|
}));
|
|
123
95
|
}
|
|
124
96
|
}
|
|
125
|
-
child(name, variables) {
|
|
126
|
-
return DI.resolve(Log_1, [
|
|
127
|
-
`${this.Name}.${name}`,
|
|
128
|
-
{
|
|
129
|
-
...this.Variables,
|
|
130
|
-
...variables,
|
|
131
|
-
},
|
|
132
|
-
this,
|
|
133
|
-
]);
|
|
134
|
-
}
|
|
135
97
|
resolveLogTargets() {
|
|
136
98
|
this.Targets = this.Rules.map((r) => {
|
|
137
99
|
const found = this.Options.targets.filter((t) => {
|
|
@@ -159,18 +121,11 @@ let Log = Log_1 = class Log extends SyncService {
|
|
|
159
121
|
});
|
|
160
122
|
}
|
|
161
123
|
};
|
|
162
|
-
|
|
163
|
-
Log.InternalLoggers = new Map();
|
|
164
|
-
Log.AttachedToExitEvents = false;
|
|
165
|
-
__decorate([
|
|
166
|
-
Autoinject(),
|
|
167
|
-
__metadata("design:type", Container)
|
|
168
|
-
], Log.prototype, "Container", void 0);
|
|
169
|
-
Log = Log_1 = __decorate([
|
|
124
|
+
FrameworkLogger = __decorate([
|
|
170
125
|
NewInstance(),
|
|
171
126
|
__metadata("design:paramtypes", [String, Object, Log])
|
|
172
|
-
],
|
|
173
|
-
export {
|
|
127
|
+
], FrameworkLogger);
|
|
128
|
+
export { FrameworkLogger };
|
|
174
129
|
const logFactoryFunction = (container, logName) => {
|
|
175
130
|
if (Log.Loggers.has(logName)) {
|
|
176
131
|
return Log.Loggers.get(logName);
|
|
@@ -197,5 +152,5 @@ DI.register(logFactoryFunction).as(Log);
|
|
|
197
152
|
// register Log class as string literal
|
|
198
153
|
// so we can resolve Log class
|
|
199
154
|
// it should not be used in production code
|
|
200
|
-
DI.register(
|
|
155
|
+
DI.register(FrameworkLogger).as("__logImplementation__");
|
|
201
156
|
//# sourceMappingURL=log.js.map
|