@spinajs/log 1.2.59 → 1.2.60
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/index.d.ts +0 -1
- package/lib/index.js +0 -1
- package/lib/index.js.map +1 -1
- package/lib/targets/ColoredConsoleTarget.js +4 -1
- package/lib/targets/ColoredConsoleTarget.js.map +1 -1
- package/lib/targets/FileTarget.js +16 -10
- package/lib/targets/FileTarget.js.map +1 -1
- package/lib/targets/LogTarget.d.ts +2 -7
- package/lib/targets/LogTarget.js +4 -61
- package/lib/targets/LogTarget.js.map +1 -1
- package/package.json +4 -4
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -12,7 +12,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("@spinajs/log-common"), exports);
|
|
14
14
|
__exportStar(require("./targets"), exports);
|
|
15
|
-
__exportStar(require("./variables"), exports);
|
|
16
15
|
__exportStar(require("./log"), exports);
|
|
17
16
|
__exportStar(require("./decorators"), exports);
|
|
18
17
|
__exportStar(require("./bootstrap"), exports);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAoC;AACpC,4CAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAoC;AACpC,4CAA0B;AAC1B,wCAAsB;AACtB,+CAA6B;AAC7B,8CAA4B"}
|
|
@@ -12,6 +12,8 @@ const di_1 = require("@spinajs/di");
|
|
|
12
12
|
const LogTarget_1 = require("./LogTarget");
|
|
13
13
|
const __1 = require("..");
|
|
14
14
|
const colors = require("colors/safe");
|
|
15
|
+
const configuration_1 = require("@spinajs/configuration");
|
|
16
|
+
const internal_logger_1 = require("@spinajs/internal-logger");
|
|
15
17
|
exports.DEFAULT_THEME = {
|
|
16
18
|
security: ["red", "bgBrightWhite"],
|
|
17
19
|
fatal: "red",
|
|
@@ -39,6 +41,7 @@ let ColoredConsoleTarget = class ColoredConsoleTarget extends LogTarget_1.LogTar
|
|
|
39
41
|
resolve() {
|
|
40
42
|
var _a;
|
|
41
43
|
colors.setTheme((_a = this.Options.theme) !== null && _a !== void 0 ? _a : exports.DEFAULT_THEME);
|
|
44
|
+
internal_logger_1.InternalLogger.debug(`Created console log target`, "file-target");
|
|
42
45
|
super.resolve();
|
|
43
46
|
}
|
|
44
47
|
async write(data) {
|
|
@@ -50,7 +53,7 @@ let ColoredConsoleTarget = class ColoredConsoleTarget extends LogTarget_1.LogTar
|
|
|
50
53
|
* we are safe to call, disable eslint
|
|
51
54
|
*/
|
|
52
55
|
/* eslint-disable */
|
|
53
|
-
colors[log_common_1.LogLevelStrings[data.Level]](
|
|
56
|
+
colors[log_common_1.LogLevelStrings[data.Level]]((0, configuration_1.format)(data.Variables, this.Options.layout)));
|
|
54
57
|
}
|
|
55
58
|
};
|
|
56
59
|
ColoredConsoleTarget = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColoredConsoleTarget.js","sourceRoot":"","sources":["../../src/targets/ColoredConsoleTarget.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAI6B;AAC7B,oCAAoD;AACpD,2CAAwC;AACxC,0BAA8B;AAC9B,sCAAsC;
|
|
1
|
+
{"version":3,"file":"ColoredConsoleTarget.js","sourceRoot":"","sources":["../../src/targets/ColoredConsoleTarget.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAI6B;AAC7B,oCAAoD;AACpD,2CAAwC;AACxC,0BAA8B;AAC9B,sCAAsC;AACtC,0DAAgD;AAChD,8DAA0D;AAE7C,QAAA,aAAa,GAAG;IAC3B,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,WAAW;IAClB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,CAAC;AAIF,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,qBAAuC;IAAjF;;QACY,0BAAqB,GAAG;YAChC,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK;YAElC,CAAC,YAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG;YAC5B,CAAC,YAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG;YAE/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAE/B,CAAC,YAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;SAC9B,CAAC;IAyBJ,CAAC;IAvBQ,OAAO;;QACZ,MAAM,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,KAAK,mCAAI,qBAAa,CAAC,CAAC;QAErD,gCAAc,CAAC,KAAK,CAAC,4BAA4B,EAAE,aAAa,CAAC,CAAC;QAElE,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAe;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACzB,OAAO;SACR;QAED,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC;QACpC;;WAEG;QACH,oBAAoB;QACnB,MAAc,CAAC,4BAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAC1C,IAAA,sBAAM,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAC5C,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AAtCY,oBAAoB;IAFhC,IAAA,cAAS,GAAE;IACX,IAAA,eAAU,EAAC,eAAe,CAAC;GACf,oBAAoB,CAsChC;AAtCY,oDAAoB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/* eslint security/detect-non-literal-fs-filename:0 -- Safe as no value holds user input */
|
|
3
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
4
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
5
4
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -8,6 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
7
|
};
|
|
9
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
9
|
exports.FileTarget = void 0;
|
|
10
|
+
const internal_logger_1 = require("@spinajs/internal-logger");
|
|
11
|
+
/* eslint security/detect-non-literal-fs-filename:0 -- Safe as no value holds user input */
|
|
11
12
|
const di_1 = require("@spinajs/di");
|
|
12
13
|
const LogTarget_1 = require("./LogTarget");
|
|
13
14
|
const fs = require("fs");
|
|
@@ -17,6 +18,7 @@ const exceptions_1 = require("@spinajs/exceptions");
|
|
|
17
18
|
const os_1 = require("os");
|
|
18
19
|
const glob = require("glob");
|
|
19
20
|
const zlib = require("zlib");
|
|
21
|
+
const configuration_1 = require("@spinajs/configuration");
|
|
20
22
|
let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
21
23
|
constructor() {
|
|
22
24
|
super(...arguments);
|
|
@@ -45,7 +47,7 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
|
45
47
|
if (!this.Options.enabled) {
|
|
46
48
|
return;
|
|
47
49
|
}
|
|
48
|
-
const result =
|
|
50
|
+
const result = (0, configuration_1.format)(data.Variables, this.Options.layout) + os_1.EOL;
|
|
49
51
|
const bytes = Buffer.byteLength(result);
|
|
50
52
|
this.BufferSize += bytes;
|
|
51
53
|
this.Buffer.push(result);
|
|
@@ -53,6 +55,7 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
|
53
55
|
this.flush();
|
|
54
56
|
}
|
|
55
57
|
if (this.CurrentFileSize > this.Options.options.maxSize) {
|
|
58
|
+
internal_logger_1.InternalLogger.debug(`File ${this.LogPath} exceeded log size ( current: ${this.CurrentFileSize}, max: ${this.Options.options.maxSize})`, "file-target");
|
|
56
59
|
this.archive();
|
|
57
60
|
}
|
|
58
61
|
}
|
|
@@ -67,9 +70,7 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
|
67
70
|
})
|
|
68
71
|
.sort((x) => x.stat.mtime.getTime());
|
|
69
72
|
const newestFile = files.length !== 0 ? files[files.length - 1].name : undefined;
|
|
70
|
-
const fIndex = newestFile
|
|
71
|
-
? parseInt(newestFile.substring(newestFile.lastIndexOf("_") + 1, newestFile.lastIndexOf("_") + 2), 10) + 1
|
|
72
|
-
: 1;
|
|
73
|
+
const fIndex = newestFile ? parseInt(newestFile.substring(newestFile.lastIndexOf("_") + 1, newestFile.lastIndexOf("_") + 2), 10) + 1 : 1;
|
|
73
74
|
const archPath = path.join(this.ArchiveDirPath, `archived_${this.LogBaseName}_${fIndex}${this.LogFileExt}`);
|
|
74
75
|
this.flush();
|
|
75
76
|
if (!fs.existsSync(this.LogPath)) {
|
|
@@ -93,8 +94,13 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
|
93
94
|
return;
|
|
94
95
|
});
|
|
95
96
|
});
|
|
97
|
+
internal_logger_1.InternalLogger.debug(`Created archived compressed file at ${zippedPath}`, "file-target");
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
internal_logger_1.InternalLogger.debug(`Created archived file at ${archPath}`, "file-target");
|
|
96
101
|
}
|
|
97
102
|
if (files.length >= this.Options.options.maxArchiveFiles) {
|
|
103
|
+
internal_logger_1.InternalLogger.debug(`Deleting old archive file ${files[0].name}`, "file-target");
|
|
98
104
|
fs.unlink(files[0].name, () => {
|
|
99
105
|
return;
|
|
100
106
|
});
|
|
@@ -110,6 +116,7 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
|
110
116
|
this.BufferSize = 0;
|
|
111
117
|
}
|
|
112
118
|
rotate() {
|
|
119
|
+
internal_logger_1.InternalLogger.debug(`Initializing rotating log files at schedule ${this.Options.options.rotate}`, "file-target");
|
|
113
120
|
if (this.Options.options.rotate) {
|
|
114
121
|
this.RotateJob = (0, node_schedule_1.scheduleJob)(`LogScheduleJob`, this.Options.options.rotate, () => {
|
|
115
122
|
this.archive();
|
|
@@ -123,11 +130,9 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
|
123
130
|
this.LogFileDescriptor = 0;
|
|
124
131
|
}
|
|
125
132
|
this.CurrentFileSize = 0;
|
|
126
|
-
this.LogDirPath =
|
|
127
|
-
this.ArchiveDirPath = this.Options.options.archivePath
|
|
128
|
-
|
|
129
|
-
: this.LogDirPath;
|
|
130
|
-
this.LogFileName = this.format(null, path.basename(this.Options.options.path));
|
|
133
|
+
this.LogDirPath = (0, configuration_1.format)(null, path.dirname(path.resolve(this.Options.options.path)));
|
|
134
|
+
this.ArchiveDirPath = this.Options.options.archivePath ? (0, configuration_1.format)(null, path.resolve(this.Options.options.archivePath)) : this.LogDirPath;
|
|
135
|
+
this.LogFileName = (0, configuration_1.format)(null, path.basename(this.Options.options.path));
|
|
131
136
|
this.LogPath = path.join(this.LogDirPath, this.LogFileName);
|
|
132
137
|
const { name, ext } = path.parse(this.LogFileName);
|
|
133
138
|
this.LogFileExt = ext;
|
|
@@ -153,6 +158,7 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
|
|
|
153
158
|
this.flush();
|
|
154
159
|
}, this.Options.options.flushTimeout);
|
|
155
160
|
}
|
|
161
|
+
internal_logger_1.InternalLogger.debug(`Creating log file at path ${this.LogPath}`, "file-target");
|
|
156
162
|
this.HasError = false;
|
|
157
163
|
this.Error = null;
|
|
158
164
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileTarget.js","sourceRoot":"","sources":["../../src/targets/FileTarget.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FileTarget.js","sourceRoot":"","sources":["../../src/targets/FileTarget.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,14 @@
|
|
|
1
1
|
import { SyncModule } from "@spinajs/di";
|
|
2
|
-
import {
|
|
2
|
+
import { ILogEntry, ICommonTargetOptions, ILogRule, ITargetsOption } from "@spinajs/log-common";
|
|
3
3
|
export interface ILogTargetDesc {
|
|
4
4
|
instance: LogTarget<ICommonTargetOptions>;
|
|
5
5
|
options?: ITargetsOption;
|
|
6
6
|
rule: ILogRule;
|
|
7
7
|
}
|
|
8
8
|
export declare abstract class LogTarget<T extends ICommonTargetOptions> extends SyncModule {
|
|
9
|
-
protected Variables: LogVariable[];
|
|
10
9
|
HasError: boolean;
|
|
11
10
|
Error: Error | null | unknown;
|
|
12
|
-
protected VariablesDictionary: Map<string, LogVariable>;
|
|
13
|
-
protected LayoutRegexp: RegExp;
|
|
14
11
|
protected Options: T;
|
|
15
|
-
constructor(
|
|
12
|
+
constructor(options: T);
|
|
16
13
|
abstract write(data: ILogEntry): Promise<void>;
|
|
17
|
-
protected format(customVars: LogVariables | null, layout: string): string;
|
|
18
|
-
protected _format(vars: LogVariables, txt: string): string;
|
|
19
14
|
}
|
package/lib/targets/LogTarget.js
CHANGED
|
@@ -1,77 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.LogTarget = void 0;
|
|
13
4
|
const di_1 = require("@spinajs/di");
|
|
14
5
|
const _ = require("lodash");
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
constructor(Variables, options) {
|
|
6
|
+
class LogTarget extends di_1.SyncModule {
|
|
7
|
+
constructor(options) {
|
|
18
8
|
super();
|
|
19
|
-
this.Variables = Variables;
|
|
20
9
|
this.HasError = false;
|
|
21
10
|
this.Error = null;
|
|
22
|
-
this.VariablesDictionary = new Map();
|
|
23
|
-
this.Variables.forEach((v) => {
|
|
24
|
-
this.VariablesDictionary.set(v.Name, v);
|
|
25
|
-
});
|
|
26
|
-
this.LayoutRegexp = /\{((.*?)(:(.*?))?)\}/gm;
|
|
27
11
|
if (options) {
|
|
28
12
|
this.Options = _.merge(_.merge(this.Options, {
|
|
29
13
|
enabled: true,
|
|
30
|
-
layout: "{datetime} {level} {message} {error} ({logger})",
|
|
14
|
+
layout: "${datetime} ${level} ${message} ${error} (${logger})",
|
|
31
15
|
}), options);
|
|
32
16
|
}
|
|
33
17
|
}
|
|
34
|
-
|
|
35
|
-
if (customVars === null || customVars === void 0 ? void 0 : customVars.message) {
|
|
36
|
-
return this._format(Object.assign(Object.assign({}, customVars), { message: this._format(customVars, customVars.message) }), layout);
|
|
37
|
-
}
|
|
38
|
-
return this._format(customVars, layout);
|
|
39
|
-
}
|
|
40
|
-
_format(vars, txt) {
|
|
41
|
-
this.LayoutRegexp.lastIndex = 0;
|
|
42
|
-
const varMatch = [...txt.matchAll(this.LayoutRegexp)];
|
|
43
|
-
if (!varMatch) {
|
|
44
|
-
return "";
|
|
45
|
-
}
|
|
46
|
-
let result = txt;
|
|
47
|
-
varMatch.forEach((v) => {
|
|
48
|
-
var _a, _b;
|
|
49
|
-
if (vars && vars[v[2]]) {
|
|
50
|
-
const fVar = vars[v[2]];
|
|
51
|
-
if (fVar instanceof Function) {
|
|
52
|
-
result = result.replace(v[0], fVar((_a = v[4]) !== null && _a !== void 0 ? _a : null));
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
result = result.replace(v[0], fVar);
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
const variable = this.VariablesDictionary.get(v[2]);
|
|
60
|
-
if (variable) {
|
|
61
|
-
// optional parameter eg. {env:PORT}
|
|
62
|
-
result = result.replace(v[0], variable.Value((_b = v[4]) !== null && _b !== void 0 ? _b : null));
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
result = result.replace(v[0], "");
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
});
|
|
69
|
-
return result;
|
|
70
|
-
}
|
|
71
|
-
};
|
|
72
|
-
LogTarget = __decorate([
|
|
73
|
-
(0, di_1.Inject)(Array.ofType(log_common_1.LogVariable)),
|
|
74
|
-
__metadata("design:paramtypes", [Array, Object])
|
|
75
|
-
], LogTarget);
|
|
18
|
+
}
|
|
76
19
|
exports.LogTarget = LogTarget;
|
|
77
20
|
//# sourceMappingURL=LogTarget.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogTarget.js","sourceRoot":"","sources":["../../src/targets/LogTarget.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LogTarget.js","sourceRoot":"","sources":["../../src/targets/LogTarget.ts"],"names":[],"mappings":";;;AAAA,oCAAyC;AACzC,4BAA4B;AAS5B,MAAsB,SAA0C,SAAQ,eAAU;IAKhF,YAAY,OAAU;QACpB,KAAK,EAAE,CAAC;QALH,aAAQ,GAAG,KAAK,CAAC;QACjB,UAAK,GAA2B,IAAI,CAAC;QAM1C,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CACpB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE;gBACpB,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,sDAAsD;aAC/D,CAAC,EACF,OAAO,CACR,CAAC;SACH;IACH,CAAC;CAGF;AApBD,8BAoBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/log",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.60",
|
|
4
4
|
"description": "Log lib for all spinejs related libs",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
},
|
|
27
27
|
"homepage": "https://github.com/spinajs/log#readme",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@spinajs/configuration": "^1.2.
|
|
29
|
+
"@spinajs/configuration": "^1.2.60",
|
|
30
30
|
"@spinajs/di": "^1.2.32",
|
|
31
31
|
"@spinajs/exceptions": "^1.2.7",
|
|
32
|
-
"@spinajs/log-common": "^1.2.
|
|
32
|
+
"@spinajs/log-common": "^1.2.60",
|
|
33
33
|
"ajv": "^8.8.2",
|
|
34
34
|
"colors": "^1.4.0",
|
|
35
35
|
"glob": "^7.2.0",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/color": "^3.0.3"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "d29df7b43d1c135b075569f94d079be323ff2ba4"
|
|
45
45
|
}
|