tabletcommand-logger 3.0.4 → 3.1.0
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/build/winston-logger.js +4 -1
- package/build/winston-logger.js.map +1 -1
- package/definitions/middleware/metrics.d.ts +2 -2
- package/definitions/middleware/metrics.d.ts.map +1 -1
- package/definitions/middleware/status-logger.d.ts +1 -1
- package/definitions/middleware/status-logger.d.ts.map +1 -1
- package/definitions/winston-logger.d.ts +3 -2
- package/definitions/winston-logger.d.ts.map +1 -1
- package/package.json +13 -13
- package/src/winston-logger.ts +5 -1
- package/definitions/bunyan-logger.d.ts +0 -4
- package/definitions/bunyan-logger.d.ts.map +0 -1
- package/definitions/middleware/types.d.ts +0 -1
- package/definitions/middleware/types.d.ts.map +0 -1
package/build/winston-logger.js
CHANGED
|
@@ -40,7 +40,10 @@ function logger(config) {
|
|
|
40
40
|
format: winston_1.format.combine(
|
|
41
41
|
// If you pass in a TimestampOptions, it will convert the date from UTC to local TZ
|
|
42
42
|
winston_1.format.timestamp(), winston_1.format.errors({ stack: true }), winston_1.format.splat(), winston_1.format.json()),
|
|
43
|
-
defaultMeta: {
|
|
43
|
+
defaultMeta: {
|
|
44
|
+
...config.extraMeta,
|
|
45
|
+
service: config.name,
|
|
46
|
+
},
|
|
44
47
|
transports: trs,
|
|
45
48
|
exitOnError: false,
|
|
46
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../src/winston-logger.ts"],"names":[],"mappings":";;;;;AAAA,qCAAmE;AAEnE,0FAAwD;AACxD,sEAA+C;
|
|
1
|
+
{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../src/winston-logger.ts"],"names":[],"mappings":";;;;;AAAA,qCAAmE;AAEnE,0FAAwD;AACxD,sEAA+C;AAc/C,SAAwB,MAAM,CAAC,MAAoB;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,YAAY,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,CAAC;IACjH,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,GAAgB,EAAE,CAAC;IAE5B,IAAI,MAAM,CAAC,YAAY,EAAE;QACvB,MAAM,GAAG,GAAc,IAAI,oBAAU,CAAC,OAAO,EAAE,CAAC;QAChD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACf;IAED,IAAI,MAAM,CAAC,SAAS,EAAE;QACpB,MAAM,KAAK,GAAoB,IAAI,mCAAe,CAAC;YACjD,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,cAAc;YAC1C,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,YAAY;YACzB,aAAa,EAAE,IAAI;YACnB,QAAQ,EAAE,KAAK;YACf,GAAG,EAAE,IAAI;YACT,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACjB;IAED,IAAI,MAAM,CAAC,YAAY,EAAE;QACvB,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;YAC9B,MAAM,EAAE,MAAM,CAAC,aAAa;YAC5B,OAAO,EAAE,MAAM,CAAC,IAAI;SACrB,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACd;IAED,MAAM,YAAY,GAAG,IAAA,sBAAY,EAAC;QAChC,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,gBAAM,CAAC,OAAO;QACpB,mFAAmF;QACnF,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAC9B,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,IAAI,EAAE,CACd;QACD,WAAW,EAAE;YACX,GAAG,MAAM,CAAC,SAAS;YACnB,OAAO,EAAE,MAAM,CAAC,IAAI;SACrB;QACD,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC;AApDD,yBAoDC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Request, Response, NextFunction } from "express";
|
|
2
|
-
|
|
2
|
+
type FilterFunction = (parameter: string) => string;
|
|
3
3
|
export default function metrics(filter?: FilterFunction): {
|
|
4
4
|
defaultFilter: (pathIn: string) => string;
|
|
5
5
|
setStatsDKey: (req: Request, hostname: string, env: string) => void;
|
|
6
6
|
statsd: () => (req: Request, res: Response, next: NextFunction) => void;
|
|
7
7
|
};
|
|
8
8
|
export declare function cleanUpParams(req: Partial<Request>): void;
|
|
9
|
-
export
|
|
9
|
+
export type MetricsModule = ReturnType<typeof metrics>;
|
|
10
10
|
export {};
|
|
11
11
|
//# sourceMappingURL=metrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D,
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/middleware/metrics.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1D,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;AAMpD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,MAAM,CAAC,EAAE,cAAc;4BAMtB,MAAM,KAAG,MAAM;wBAmBnB,OAAO,YAAY,MAAM,OAAO,MAAM;wBA4B/B,OAAO,OAAO,QAAQ,QAAQ,YAAY;EAiB7E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,QAsBlD;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from "winston";
|
|
2
2
|
import { NextFunction, Request, Response } from "express";
|
|
3
3
|
export default function statusLogger(logger?: Logger): (req: Request, res: Response, next: NextFunction) => void;
|
|
4
|
-
export
|
|
4
|
+
export type StatusLoggerModule = ReturnType<typeof statusLogger>;
|
|
5
5
|
//# sourceMappingURL=status-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAiCjB,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,SACf,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA8D9E;AAED,
|
|
1
|
+
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAiCjB,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,SACf,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA8D9E;AAED,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from "winston";
|
|
2
|
-
export
|
|
2
|
+
export type LoggerConfig = {
|
|
3
3
|
name: string;
|
|
4
4
|
filename: string;
|
|
5
5
|
dirname: string;
|
|
@@ -7,7 +7,8 @@ export declare type LoggerConfig = {
|
|
|
7
7
|
logToFile: boolean;
|
|
8
8
|
logToDatadog: boolean;
|
|
9
9
|
datadogApiKey: string;
|
|
10
|
+
extraMeta?: Record<string, unknown>;
|
|
10
11
|
};
|
|
11
12
|
export default function logger(config: LoggerConfig): Logger | null;
|
|
12
|
-
export
|
|
13
|
+
export type LoggerModule = ReturnType<typeof logger>;
|
|
13
14
|
//# sourceMappingURL=winston-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"winston-logger.d.ts","sourceRoot":"","sources":["../src/winston-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,MAAM,EAAE,MAAM,SAAS,CAAC;AAKnE,
|
|
1
|
+
{"version":3,"file":"winston-logger.d.ts","sourceRoot":"","sources":["../src/winston-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,MAAM,EAAE,MAAM,SAAS,CAAC;AAKnE,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IAEnB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CAoDlE;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-logger",
|
|
3
|
-
"version": "3.0
|
|
3
|
+
"version": "3.1.0",
|
|
4
4
|
"description": "Tablet Command Logging Configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "gulp ts",
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"types": "definitions/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"datadog-winston": "^1.6.0",
|
|
20
|
-
"debug": "^4.3.
|
|
20
|
+
"debug": "^4.3.7",
|
|
21
21
|
"express-statsd": "^0.3.0",
|
|
22
22
|
"lodash": "^4.17.21",
|
|
23
|
-
"winston": "^3.
|
|
23
|
+
"winston": "^3.17.0",
|
|
24
24
|
"winston-daily-rotate-file": "^5.0.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
@@ -28,22 +28,22 @@
|
|
|
28
28
|
"@types/datadog-winston": "^1.0.7",
|
|
29
29
|
"@types/debug": "4.1.12",
|
|
30
30
|
"@types/express": "^4.17.21",
|
|
31
|
-
"@types/express-serve-static-core": "^4.19.
|
|
31
|
+
"@types/express-serve-static-core": "^4.19.6",
|
|
32
32
|
"@types/gulp-copy": "0.0.7",
|
|
33
33
|
"@types/lodash": "^4.17.0",
|
|
34
|
-
"@types/mocha": "^10.0.
|
|
35
|
-
"@types/node": "^
|
|
34
|
+
"@types/mocha": "^10.0.10",
|
|
35
|
+
"@types/node": "^22.10.1",
|
|
36
36
|
"@typescript-eslint/eslint-plugin": "^6.20.0",
|
|
37
37
|
"@typescript-eslint/parser": "^6.20.0",
|
|
38
|
-
"chai": "^4.
|
|
38
|
+
"chai": "^4.5.0",
|
|
39
39
|
"del": "^6.1.1",
|
|
40
|
-
"eslint": "^8.
|
|
40
|
+
"eslint": "^8.57.1",
|
|
41
41
|
"eslint-config-standard": "^17.1.0",
|
|
42
|
-
"eslint-plugin-import": "^2.
|
|
42
|
+
"eslint-plugin-import": "^2.31.0",
|
|
43
43
|
"eslint-plugin-mocha-only": "0.0.3",
|
|
44
44
|
"eslint-plugin-node": "^11.1.0",
|
|
45
|
-
"eslint-plugin-promise": "^6.
|
|
46
|
-
"eslint-plugin-security": "^2.1.
|
|
45
|
+
"eslint-plugin-promise": "^6.6.0",
|
|
46
|
+
"eslint-plugin-security": "^2.1.1",
|
|
47
47
|
"eslint-plugin-standard": "^4.1.0",
|
|
48
48
|
"gulp": "^4.0.2",
|
|
49
49
|
"gulp-cli": "^2.3.0",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"gulp-eslint": "^6.0.0",
|
|
52
52
|
"gulp-mocha": "^8.0.0",
|
|
53
53
|
"gulp-shell": "^0.8.0",
|
|
54
|
-
"mocha": "^10.
|
|
55
|
-
"typescript": "~4.
|
|
54
|
+
"mocha": "^10.8.2",
|
|
55
|
+
"typescript": "~4.9.5"
|
|
56
56
|
}
|
|
57
57
|
}
|
package/src/winston-logger.ts
CHANGED
|
@@ -12,6 +12,7 @@ export type LoggerConfig = {
|
|
|
12
12
|
|
|
13
13
|
logToDatadog: boolean,
|
|
14
14
|
datadogApiKey: string,
|
|
15
|
+
extraMeta?: Record<string, unknown>,
|
|
15
16
|
};
|
|
16
17
|
|
|
17
18
|
export default function logger(config: LoggerConfig): Logger | null {
|
|
@@ -57,7 +58,10 @@ export default function logger(config: LoggerConfig): Logger | null {
|
|
|
57
58
|
format.splat(),
|
|
58
59
|
format.json()
|
|
59
60
|
),
|
|
60
|
-
defaultMeta: {
|
|
61
|
+
defaultMeta: {
|
|
62
|
+
...config.extraMeta,
|
|
63
|
+
service: config.name,
|
|
64
|
+
},
|
|
61
65
|
transports: trs,
|
|
62
66
|
exitOnError: false,
|
|
63
67
|
});
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bunyan-logger.d.ts","sourceRoot":"","sources":["../src/bunyan-logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAkB,MAAM,QAAQ,CAAC;AAExC,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAmCvH;AAED,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/middleware/types.ts"],"names":[],"mappings":""}
|