tabletcommand-logger 2.4.0 → 3.0.1

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/index.js CHANGED
@@ -27,11 +27,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  exports.statusLogger = exports.metricsMiddleware = exports.metricsCleanUpParams = exports.loggerMiddleware = exports.logger = void 0;
30
- const bunyan_logger_1 = __importDefault(require("./bunyan-logger"));
30
+ const winston_logger_1 = __importDefault(require("./winston-logger"));
31
31
  const logger_1 = __importDefault(require("./middleware/logger"));
32
32
  const metrics_1 = __importStar(require("./middleware/metrics"));
33
33
  const status_logger_1 = __importDefault(require("./middleware/status-logger"));
34
- exports.logger = bunyan_logger_1.default;
34
+ exports.logger = winston_logger_1.default;
35
35
  exports.loggerMiddleware = logger_1.default;
36
36
  exports.metricsCleanUpParams = metrics_1.cleanUpParams;
37
37
  exports.metricsMiddleware = metrics_1.default;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oEAAsC;AACtC,iEAAoD;AACpD,gEAA0E;AAC1E,+EAAuD;AAE1C,QAAA,MAAM,GAAG,uBAAO,CAAC;AACjB,QAAA,gBAAgB,GAAG,gBAAiB,CAAC;AACrC,QAAA,oBAAoB,GAAG,uBAAa,CAAC;AACrC,QAAA,iBAAiB,GAAG,iBAAkB,CAAC;AACvC,QAAA,YAAY,GAAG,uBAAa,CAAC;AAE1C,kBAAe;IACb,MAAM,EAAN,cAAM;IACN,gBAAgB,EAAhB,wBAAgB;IAChB,iBAAiB,EAAjB,yBAAiB;IACjB,oBAAoB,EAApB,4BAAoB;IACpB,YAAY,EAAZ,oBAAY;CACb,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sEAAuC;AACvC,iEAAoD;AACpD,gEAA0E;AAC1E,+EAAuD;AAI1C,QAAA,MAAM,GAAG,wBAAO,CAAC;AACjB,QAAA,gBAAgB,GAAG,gBAAiB,CAAC;AACrC,QAAA,oBAAoB,GAAG,uBAAa,CAAC;AACrC,QAAA,iBAAiB,GAAG,iBAAkB,CAAC;AACvC,QAAA,YAAY,GAAG,uBAAa,CAAC;AAE1C,kBAAe;IACb,MAAM,EAAN,cAAM;IACN,gBAAgB,EAAhB,wBAAgB;IAChB,iBAAiB,EAAjB,yBAAiB;IACjB,oBAAoB,EAApB,4BAAoB;IACpB,YAAY,EAAZ,oBAAY;CACb,CAAC"}
@@ -25,7 +25,7 @@ function loggerMiddleware(logger) {
25
25
  originalUrl: req.originalUrl
26
26
  },
27
27
  status: res.statusCode ? res.statusCode : 0
28
- }, "access_log");
28
+ });
29
29
  });
30
30
  return next();
31
31
  };
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":";;AAOA,SAAwB,gBAAgB,CAAC,MAAe;IACtD,OAAO,SAAS,mBAAmB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjF,kFAAkF;QAClF,2DAA2D;QAC3D,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,gCAAgC;YAChC,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YACD,MAAM,CAAC,IAAI,CAAC;gBACV,aAAa,EAAE,GAAG,CAAC,EAAE;gBACrB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,GAAG,EAAE,GAAG,CAAC,WAAW;gBACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,WAAW,EAAE,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,EAAE;gBAC9D,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;gBACpC,yBAAyB;gBACzB,GAAG,EAAE;oBACH,IAAI,EAAE,GAAG,CAAC,IAAe;oBACzB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,WAAW,EAAE,GAAG,CAAC,WAAW;iBAC7B;gBACD,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aAC5C,EAAE,YAAY,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AA7BD,mCA6BC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":";;AAOA,SAAwB,gBAAgB,CAAC,MAAe;IACtD,OAAO,SAAS,mBAAmB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjF,kFAAkF;QAClF,2DAA2D;QAC3D,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,gCAAgC;YAChC,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;aACR;YACD,MAAM,CAAC,IAAI,CAAC;gBACV,aAAa,EAAE,GAAG,CAAC,EAAE;gBACrB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,GAAG,EAAE,GAAG,CAAC,WAAW;gBACpB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,WAAW,EAAE,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,EAAE;gBAC9D,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;gBACpC,yBAAyB;gBACzB,GAAG,EAAE;oBACH,IAAI,EAAE,GAAG,CAAC,IAAe;oBACzB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,WAAW,EAAE,GAAG,CAAC,WAAW;iBAC7B;gBACD,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AA7BD,mCA6BC"}
@@ -1 +1 @@
1
- {"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,50 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const winston_1 = require("winston");
7
+ const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
8
+ const datadog_winston_1 = __importDefault(require("datadog-winston"));
9
+ function logger(config) {
10
+ const loggingEnabled = config.logToConsole === true || config.logToFile === true || config.logToDatadog === true;
11
+ if (!loggingEnabled) {
12
+ return null;
13
+ }
14
+ const trs = [];
15
+ if (config.logToConsole) {
16
+ const cfg = new winston_1.transports.Console();
17
+ trs.push(cfg);
18
+ }
19
+ if (config.logToFile) {
20
+ const daily = new winston_daily_rotate_file_1.default({
21
+ filename: `${config.filename}-%DATE%.json`,
22
+ dirname: config.dirname,
23
+ datePattern: "YYYY-MM-DD",
24
+ zippedArchive: true,
25
+ maxFiles: "52d",
26
+ utc: true,
27
+ watchLog: true,
28
+ });
29
+ trs.push(daily);
30
+ }
31
+ if (config.logToDatadog) {
32
+ const dd = new datadog_winston_1.default({
33
+ apiKey: config.ddApiKey,
34
+ service: config.name,
35
+ });
36
+ trs.push(dd);
37
+ }
38
+ const loggerClient = (0, winston_1.createLogger)({
39
+ level: "info",
40
+ format: winston_1.format.combine(winston_1.format.timestamp({
41
+ format: "isoDateTime"
42
+ }), winston_1.format.errors({ stack: true }), winston_1.format.splat(), winston_1.format.json()),
43
+ defaultMeta: { service: name },
44
+ transports: trs,
45
+ exitOnError: false,
46
+ });
47
+ return loggerClient;
48
+ }
49
+ exports.default = logger;
50
+ //# sourceMappingURL=winston-logger.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../src/winston-logger.ts"],"names":[],"mappings":";;;;;AAAA,qCAAmE;AAEnE,0FAAwD;AACxD,sEAA+C;AAa/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,QAAQ;YACvB,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,CACpB,gBAAM,CAAC,SAAS,CAAC;YACf,MAAM,EAAE,aAAa;SACtB,CAAC,EACF,gBAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAC9B,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,IAAI,EAAE,CACd;QACD,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;QAC9B,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC;AAlDD,yBAkDC"}
@@ -1,7 +1,8 @@
1
- import _logger from "./bunyan-logger";
1
+ import _logger from "./winston-logger";
2
2
  import _loggerMiddleware from "./middleware/logger";
3
3
  import _metricsMiddleware, { cleanUpParams } from "./middleware/metrics";
4
4
  import _statusLogger from "./middleware/status-logger";
5
+ export { LoggerConfig } from "./winston-logger";
5
6
  export declare const logger: typeof _logger;
6
7
  export declare const loggerMiddleware: typeof _loggerMiddleware;
7
8
  export declare const metricsCleanUpParams: typeof cleanUpParams;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,kBAAkB,EAAE,EAAE,aAAa,EAAG,MAAM,sBAAsB,CAAC;AAC1E,OAAO,aAAa,MAAM,4BAA4B,CAAC;AAEvD,eAAO,MAAM,MAAM,gBAAU,CAAC;AAC9B,eAAO,MAAM,gBAAgB,0BAAoB,CAAC;AAClD,eAAO,MAAM,oBAAoB,sBAAgB,CAAC;AAClD,eAAO,MAAM,iBAAiB,2BAAqB,CAAC;AACpD,eAAO,MAAM,YAAY,sBAAgB,CAAC;;;;;;;;AAE1C,wBAME"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,kBAAkB,EAAE,EAAE,aAAa,EAAG,MAAM,sBAAsB,CAAC;AAC1E,OAAO,aAAa,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,eAAO,MAAM,MAAM,gBAAU,CAAC;AAC9B,eAAO,MAAM,gBAAgB,0BAAoB,CAAC;AAClD,eAAO,MAAM,oBAAoB,sBAAgB,CAAC;AAClD,eAAO,MAAM,iBAAiB,2BAAqB,CAAC;AACpD,eAAO,MAAM,YAAY,sBAAgB,CAAC;;;;;;;;AAE1C,wBAME"}
@@ -1,4 +1,4 @@
1
- import bunyan from "bunyan";
1
+ import { Logger } from "winston";
2
2
  import { NextFunction, Request, Response } from "express";
3
- export default function loggerMiddleware(logger?: bunyan): (req: Request, res: Response, next: NextFunction) => void;
3
+ export default function loggerMiddleware(logger?: Logger): (req: Request, res: Response, next: NextFunction) => void;
4
4
  //# sourceMappingURL=logger.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,SACb,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA4BpF"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,SACb,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA4BpF"}
@@ -1,5 +1,5 @@
1
- import bunyan from "bunyan";
1
+ import { Logger } from "winston";
2
2
  import { NextFunction, Request, Response } from "express";
3
- export default function statusLogger(logger?: bunyan): (req: Request, res: Response, next: NextFunction) => void;
3
+ export default function statusLogger(logger?: Logger): (req: Request, res: Response, next: NextFunction) => void;
4
4
  export declare 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,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAwBjB,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,SACf,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA8D9E;AAED,oBAAY,kBAAkB,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}
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;AAwBjB,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,SACf,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA8D9E;AAED,oBAAY,kBAAkB,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}
@@ -0,0 +1,13 @@
1
+ import { Logger } from "winston";
2
+ export declare type LoggerConfig = {
3
+ name: string;
4
+ filename: string;
5
+ dirname: string;
6
+ ddApiKey: string;
7
+ logToConsole?: boolean;
8
+ logToDatadog?: boolean;
9
+ logToFile?: boolean;
10
+ };
11
+ export default function logger(config: LoggerConfig): Logger | null;
12
+ export declare type LoggerModule = ReturnType<typeof logger>;
13
+ //# sourceMappingURL=winston-logger.d.ts.map
@@ -0,0 +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,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CAkDlE;AAED,oBAAY,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": "2.4.0",
3
+ "version": "3.0.1",
4
4
  "description": "Tablet Command Logging Configuration",
5
5
  "scripts": {
6
6
  "build": "gulp ts",
@@ -16,21 +16,23 @@
16
16
  "main": "build/index.js",
17
17
  "types": "definitions/index.d.ts",
18
18
  "dependencies": {
19
- "bunyan": "^1.8.15",
19
+ "datadog-winston": "^1.6.0",
20
20
  "debug": "^4.3.4",
21
21
  "express-statsd": "^0.3.0",
22
- "lodash": "^4.17.21"
22
+ "lodash": "^4.17.21",
23
+ "winston": "^3.13.0",
24
+ "winston-daily-rotate-file": "^5.0.0"
23
25
  },
24
26
  "devDependencies": {
25
- "@types/bunyan": "^1.8.11",
26
- "@types/chai": "^4.3.11",
27
+ "@types/chai": "^4.3.14",
28
+ "@types/datadog-winston": "^1.0.7",
27
29
  "@types/debug": "4.1.12",
28
30
  "@types/express": "^4.17.21",
29
- "@types/express-serve-static-core": "^4.17.42",
31
+ "@types/express-serve-static-core": "^4.19.0",
30
32
  "@types/gulp-copy": "0.0.7",
31
- "@types/lodash": "^4.14.202",
33
+ "@types/lodash": "^4.17.0",
32
34
  "@types/mocha": "^10.0.6",
33
- "@types/node": "^20.11.14",
35
+ "@types/node": "^20.12.7",
34
36
  "@typescript-eslint/eslint-plugin": "^6.20.0",
35
37
  "@typescript-eslint/parser": "^6.20.0",
36
38
  "chai": "^4.3.10",
@@ -49,7 +51,7 @@
49
51
  "gulp-eslint": "^6.0.0",
50
52
  "gulp-mocha": "^8.0.0",
51
53
  "gulp-shell": "^0.8.0",
52
- "mocha": "^10.2.0",
54
+ "mocha": "^10.4.0",
53
55
  "typescript": "~4.7.4"
54
56
  }
55
- }
57
+ }
package/src/index.ts CHANGED
@@ -1,9 +1,11 @@
1
1
 
2
- import _logger from "./bunyan-logger";
2
+ import _logger from "./winston-logger";
3
3
  import _loggerMiddleware from "./middleware/logger";
4
4
  import _metricsMiddleware, { cleanUpParams, } from "./middleware/metrics";
5
5
  import _statusLogger from "./middleware/status-logger";
6
6
 
7
+ export { LoggerConfig } from "./winston-logger";
8
+
7
9
  export const logger = _logger;
8
10
  export const loggerMiddleware = _loggerMiddleware;
9
11
  export const metricsCleanUpParams = cleanUpParams;
@@ -1,11 +1,11 @@
1
- import bunyan from "bunyan";
1
+ import { Logger } from "winston";
2
2
  import {
3
3
  NextFunction,
4
4
  Request,
5
5
  Response,
6
6
  } from "express";
7
7
 
8
- export default function loggerMiddleware(logger?: bunyan) {
8
+ export default function loggerMiddleware(logger?: Logger) {
9
9
  return function accessLogMiddleware(req: Request, res: Response, next: NextFunction) {
10
10
  // This doesn't fire the log immediately, but waits until the response is finished
11
11
  // This means we have a chance of logging the response code
@@ -30,7 +30,7 @@ export default function loggerMiddleware(logger?: bunyan) {
30
30
  originalUrl: req.originalUrl
31
31
  },
32
32
  status: res.statusCode ? res.statusCode : 0
33
- }, "access_log");
33
+ });
34
34
  });
35
35
  return next();
36
36
  };
@@ -1,4 +1,5 @@
1
- import bunyan from "bunyan";
1
+ import { Logger } from "winston";
2
+
2
3
  import {
3
4
  NextFunction,
4
5
  Request,
@@ -27,7 +28,7 @@ function requestDuration(endTime: Date, startTime?: Date): number {
27
28
  return endTime.valueOf() - startTime.valueOf();
28
29
  }
29
30
 
30
- export default function statusLogger(logger?: bunyan) {
31
+ export default function statusLogger(logger?: Logger) {
31
32
  return function requestLogger(req: Request, res: Response, next: NextFunction) {
32
33
  if (!_.isObject(req._startTime)) {
33
34
  req._startTime = new Date();
@@ -0,0 +1,69 @@
1
+ import { createLogger, format, transports, Logger } from "winston";
2
+ import * as Transport from "winston-transport";
3
+ import DailyRotateFile from "winston-daily-rotate-file";
4
+ import DataDogTransport from "datadog-winston";
5
+
6
+ export type LoggerConfig = {
7
+ name: string, // name of the logger
8
+ filename: string, // file where data is written (rotated)
9
+ dirname: string, // folder where data is saved
10
+ ddApiKey: string,
11
+
12
+ logToConsole?: boolean,
13
+ logToDatadog?: boolean,
14
+ logToFile?: boolean,
15
+ };
16
+
17
+ export default function logger(config: LoggerConfig): Logger | null {
18
+ const loggingEnabled = config.logToConsole === true || config.logToFile === true || config.logToDatadog === true;
19
+ if (!loggingEnabled) {
20
+ return null;
21
+ }
22
+
23
+ const trs: Transport[] = [];
24
+
25
+ if (config.logToConsole) {
26
+ const cfg: Transport = new transports.Console();
27
+ trs.push(cfg);
28
+ }
29
+
30
+ if (config.logToFile) {
31
+ const daily: DailyRotateFile = new DailyRotateFile({
32
+ filename: `${config.filename}-%DATE%.json`,
33
+ dirname: config.dirname,
34
+ datePattern: "YYYY-MM-DD",
35
+ zippedArchive: true,
36
+ maxFiles: "52d",
37
+ utc: true,
38
+ watchLog: true,
39
+ });
40
+ trs.push(daily);
41
+ }
42
+
43
+ if (config.logToDatadog) {
44
+ const dd = new DataDogTransport({
45
+ apiKey: config.ddApiKey,
46
+ service: config.name,
47
+ });
48
+ trs.push(dd);
49
+ }
50
+
51
+ const loggerClient = createLogger({
52
+ level: "info",
53
+ format: format.combine(
54
+ format.timestamp({
55
+ format: "isoDateTime"
56
+ }),
57
+ format.errors({ stack: true }),
58
+ format.splat(),
59
+ format.json()
60
+ ),
61
+ defaultMeta: { service: name },
62
+ transports: trs,
63
+ exitOnError: false,
64
+ });
65
+
66
+ return loggerClient;
67
+ }
68
+
69
+ export type LoggerModule = ReturnType<typeof logger>;
@@ -1,40 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- const bunyan_1 = __importDefault(require("bunyan"));
7
- function logger(name, filePath, logToConsole, logToFile) {
8
- const loggingEnabled = logToConsole === true || logToFile === true;
9
- if (!loggingEnabled) {
10
- return null;
11
- }
12
- const streams = [];
13
- if (logToConsole) {
14
- const cfg = {
15
- level: "debug",
16
- stream: process.stdout,
17
- };
18
- streams.push(cfg);
19
- }
20
- if (logToFile) {
21
- const cfg = {
22
- type: "rotating-file",
23
- path: filePath,
24
- period: "1d",
25
- count: 52,
26
- };
27
- streams.push(cfg);
28
- }
29
- const loggerClient = bunyan_1.default.createLogger({
30
- name,
31
- streams,
32
- });
33
- // Reopen file streams on signal
34
- process.on("SIGUSR2", () => {
35
- loggerClient.reopenFileStreams();
36
- });
37
- return loggerClient;
38
- }
39
- exports.default = logger;
40
- //# sourceMappingURL=bunyan-logger.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"bunyan-logger.js","sourceRoot":"","sources":["../src/bunyan-logger.ts"],"names":[],"mappings":";;;;;AAAA,oDAAwC;AAExC,SAAwB,MAAM,CAAC,IAAY,EAAE,QAAgB,EAAE,YAAqB,EAAE,SAAkB;IACtG,MAAM,cAAc,GAAG,YAAY,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC;IACnE,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,YAAY,EAAE;QAChB,MAAM,GAAG,GAAW;YAClB,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACnB;IACD,IAAI,SAAS,EAAE;QACb,MAAM,GAAG,GAAW;YAClB,IAAI,EAAE,eAAe;YACrB,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,EAAE;SACV,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACnB;IAED,MAAM,YAAY,GAAG,gBAAM,CAAC,YAAY,CAAC;QACvC,IAAI;QACJ,OAAO;KACR,CAAC,CAAC;IAEH,gCAAgC;IAChC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACzB,YAAY,CAAC,iBAAiB,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC;AAnCD,yBAmCC"}
@@ -1,40 +0,0 @@
1
- import bunyan, { Stream } from "bunyan";
2
-
3
- export default function logger(name: string, filePath: string, logToConsole: boolean, logToFile: boolean): bunyan | null {
4
- const loggingEnabled = logToConsole === true || logToFile === true;
5
- if (!loggingEnabled) {
6
- return null;
7
- }
8
-
9
- const streams: Stream[] = [];
10
- if (logToConsole) {
11
- const cfg: Stream = {
12
- level: "debug",
13
- stream: process.stdout,
14
- };
15
- streams.push(cfg);
16
- }
17
- if (logToFile) {
18
- const cfg: Stream = {
19
- type: "rotating-file",
20
- path: filePath,
21
- period: "1d",
22
- count: 52,
23
- };
24
- streams.push(cfg);
25
- }
26
-
27
- const loggerClient = bunyan.createLogger({
28
- name,
29
- streams,
30
- });
31
-
32
- // Reopen file streams on signal
33
- process.on("SIGUSR2", () => {
34
- loggerClient.reopenFileStreams();
35
- });
36
-
37
- return loggerClient;
38
- }
39
-
40
- export type LoggerModule = ReturnType<typeof logger>;