@golemio/core 1.2.22-dev.689876625 → 1.2.22-dev.694978995
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/helpers/data-access/storage/AzureBlobStorageService.d.ts +1 -1
- package/dist/helpers/data-access/storage/NoopStorageService.d.ts +1 -1
- package/dist/helpers/data-access/storage/StorageServiceFactory.d.ts +1 -1
- package/dist/helpers/index.d.ts +1 -1
- package/dist/helpers/index.js +1 -1
- package/dist/helpers/index.js.map +1 -1
- package/dist/helpers/logger/LoggerProvider.d.ts +14 -0
- package/dist/helpers/logger/LoggerProvider.js +59 -0
- package/dist/helpers/logger/LoggerProvider.js.map +1 -0
- package/dist/helpers/logger/RequestLoggerProvider.d.ts +24 -0
- package/dist/helpers/logger/RequestLoggerProvider.js +48 -0
- package/dist/helpers/logger/RequestLoggerProvider.js.map +1 -0
- package/dist/helpers/logger/index.d.ts +2 -0
- package/dist/helpers/logger/index.js +19 -0
- package/dist/helpers/logger/index.js.map +1 -0
- package/dist/input-gateway/connectors/AMQPConnector.js +1 -1
- package/dist/input-gateway/connectors/AMQPConnector.js.map +1 -1
- package/dist/input-gateway/helpers/Logger.d.ts +2 -3
- package/dist/input-gateway/helpers/Logger.js +4 -4
- package/dist/input-gateway/helpers/Logger.js.map +1 -1
- package/dist/input-gateway/helpers/SaveRawDataMiddleware.js +2 -2
- package/dist/input-gateway/helpers/SaveRawDataMiddleware.js.map +1 -1
- package/dist/integration-engine/connectors/AMQPConnector.js +1 -1
- package/dist/integration-engine/connectors/AMQPConnector.js.map +1 -1
- package/dist/integration-engine/helpers/Logger.d.ts +2 -3
- package/dist/integration-engine/helpers/Logger.js +4 -4
- package/dist/integration-engine/helpers/Logger.js.map +1 -1
- package/dist/output-gateway/Logger.d.ts +2 -3
- package/dist/output-gateway/Logger.js +3 -3
- package/dist/output-gateway/Logger.js.map +1 -1
- package/package.json +7 -6
- package/dist/helpers/Logger.d.ts +0 -33
- package/dist/helpers/Logger.js +0 -103
- package/dist/helpers/Logger.js.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import { ILogger } from "../../
|
|
3
|
+
import { ILogger } from "../../logger";
|
|
4
4
|
import { AbstractStorageService } from "./AbstractStorageService";
|
|
5
5
|
export interface IAzureBlobStorageConfig {
|
|
6
6
|
connectionString: string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { ILogger } from "../../
|
|
2
|
+
import { ILogger } from "../../logger";
|
|
3
3
|
import { AbstractStorageService } from "./AbstractStorageService";
|
|
4
4
|
export declare class NoopStorageService extends AbstractStorageService {
|
|
5
5
|
private readonly log;
|
package/dist/helpers/index.d.ts
CHANGED
package/dist/helpers/index.js
CHANGED
|
@@ -17,6 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
/* helpers/index.ts */
|
|
18
18
|
__exportStar(require("./BaseApp"), exports);
|
|
19
19
|
__exportStar(require("./ConfigLoader"), exports);
|
|
20
|
-
__exportStar(require("./Logger"), exports);
|
|
21
20
|
__exportStar(require("./HealthCheck"), exports);
|
|
21
|
+
__exportStar(require("./logger"), exports);
|
|
22
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sBAAsB;AACtB,4CAA0B;AAC1B,iDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sBAAsB;AACtB,4CAA0B;AAC1B,iDAA+B;AAC/B,gDAA8B;AAC9B,2CAAyB"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import pino, { DestinationStream } from "pino";
|
|
2
|
+
export declare type ILogger = pino.Logger<{
|
|
3
|
+
customLevels: {
|
|
4
|
+
verbose: number;
|
|
5
|
+
silly: number;
|
|
6
|
+
};
|
|
7
|
+
}>;
|
|
8
|
+
export declare type ILogLevels = "error" | "warn" | "info" | "verbose" | "debug" | "silly";
|
|
9
|
+
export interface ICreateLogger {
|
|
10
|
+
projectName: string;
|
|
11
|
+
nodeEnv: string;
|
|
12
|
+
logLevel?: string;
|
|
13
|
+
}
|
|
14
|
+
export declare const createLogger: ({ projectName, nodeEnv, logLevel }: ICreateLogger, stream?: DestinationStream) => ILogger;
|
|
@@ -0,0 +1,59 @@
|
|
|
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
|
+
exports.createLogger = void 0;
|
|
7
|
+
const debug_1 = __importDefault(require("debug"));
|
|
8
|
+
const pino_1 = __importDefault(require("pino"));
|
|
9
|
+
const { wrapErrorSerializer } = pino_1.default.stdSerializers;
|
|
10
|
+
const errors_1 = require("@golemio/errors");
|
|
11
|
+
const formatCustomErrorLog = (err) => {
|
|
12
|
+
const obj = err.toObject();
|
|
13
|
+
return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ message: obj.error_message }, (obj.error_class_name && { class_name: obj.error_class_name })), (obj.error_status && { status: obj.error_status })), (obj.error_info && { cause: obj.error_info })), (obj.stack_trace && { stack: obj.stack_trace })), { type: "CustomError" });
|
|
14
|
+
};
|
|
15
|
+
const errorSerializer = wrapErrorSerializer((err) => {
|
|
16
|
+
if (err.raw instanceof errors_1.CustomError) {
|
|
17
|
+
return formatCustomErrorLog(err.raw);
|
|
18
|
+
}
|
|
19
|
+
return err;
|
|
20
|
+
});
|
|
21
|
+
const createLogger = ({ projectName, nodeEnv, logLevel }, stream) => {
|
|
22
|
+
const options = Object.assign({ level: (logLevel === null || logLevel === void 0 ? void 0 : logLevel.toLowerCase()) || "info", customLevels: {
|
|
23
|
+
verbose: 25,
|
|
24
|
+
silly: 5,
|
|
25
|
+
}, base: undefined, messageKey: "message", errorKey: "error", timestamp: nodeEnv === "development", formatters: {
|
|
26
|
+
level: (label) => {
|
|
27
|
+
return { level: label };
|
|
28
|
+
},
|
|
29
|
+
}, serializers: {
|
|
30
|
+
error: errorSerializer,
|
|
31
|
+
} }, (nodeEnv === "development" && {
|
|
32
|
+
transport: {
|
|
33
|
+
target: "pino-pretty",
|
|
34
|
+
options: {
|
|
35
|
+
colorize: true,
|
|
36
|
+
destination: 1,
|
|
37
|
+
translateTime: "SYS:HH:MM:ss.l",
|
|
38
|
+
messageKey: "message",
|
|
39
|
+
},
|
|
40
|
+
},
|
|
41
|
+
}));
|
|
42
|
+
const logger = stream ? (0, pino_1.default)(options, stream) : (0, pino_1.default)(options);
|
|
43
|
+
// Log all "SILLY" and "DEBUG" logs to debug module as well
|
|
44
|
+
const debugLog = (0, debug_1.default)(`golemio:${projectName}:debug`);
|
|
45
|
+
const sillyLog = (0, debug_1.default)(`golemio:${projectName}:silly`);
|
|
46
|
+
const loggerDebugLog = logger.debug.bind(logger);
|
|
47
|
+
const loggerSillyLog = logger.silly.bind(logger);
|
|
48
|
+
logger.silly = (...args) => {
|
|
49
|
+
sillyLog.apply(null, args);
|
|
50
|
+
loggerSillyLog.apply(null, args);
|
|
51
|
+
};
|
|
52
|
+
logger.debug = (...args) => {
|
|
53
|
+
debugLog.apply(null, args);
|
|
54
|
+
loggerDebugLog.apply(null, args);
|
|
55
|
+
};
|
|
56
|
+
return logger;
|
|
57
|
+
};
|
|
58
|
+
exports.createLogger = createLogger;
|
|
59
|
+
//# sourceMappingURL=LoggerProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LoggerProvider.js","sourceRoot":"","sources":["../../../src/helpers/logger/LoggerProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { IncomingMessage } from "http";
|
|
2
|
+
import { DestinationStream } from "pino";
|
|
3
|
+
import { SerializedRequest, SerializedResponse } from "pino-std-serializers";
|
|
4
|
+
import { ILogger } from "./LoggerProvider";
|
|
5
|
+
export declare type ExtendedRequest = IncomingMessage & {
|
|
6
|
+
session?: {
|
|
7
|
+
user?: any;
|
|
8
|
+
};
|
|
9
|
+
};
|
|
10
|
+
export declare const requestSerializer: (req: SerializedRequest & {
|
|
11
|
+
raw: ExtendedRequest;
|
|
12
|
+
}) => {
|
|
13
|
+
httpVersion: string;
|
|
14
|
+
method: string;
|
|
15
|
+
url: string;
|
|
16
|
+
userId: any;
|
|
17
|
+
remoteAddress: string;
|
|
18
|
+
userAgent: string;
|
|
19
|
+
};
|
|
20
|
+
export declare const responseSerializer: (res: SerializedResponse) => {
|
|
21
|
+
status: number;
|
|
22
|
+
contentLength: string | number | string[] | undefined;
|
|
23
|
+
};
|
|
24
|
+
export declare const createRequestLogger: (nodeEnv: string, logger: ILogger, stream?: DestinationStream) => import("pino-http").HttpLogger;
|
|
@@ -0,0 +1,48 @@
|
|
|
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
|
+
exports.createRequestLogger = exports.responseSerializer = exports.requestSerializer = void 0;
|
|
7
|
+
const pino_http_1 = __importDefault(require("pino-http"));
|
|
8
|
+
const requestSerializer = (req) => {
|
|
9
|
+
var _a;
|
|
10
|
+
return ({
|
|
11
|
+
httpVersion: req.raw.httpVersion,
|
|
12
|
+
method: req.method,
|
|
13
|
+
url: req.url,
|
|
14
|
+
userId: ((_a = req.raw.session) === null || _a === void 0 ? void 0 : _a.user) ? req.raw.session.user.id : null,
|
|
15
|
+
remoteAddress: req.remoteAddress,
|
|
16
|
+
userAgent: req.headers["user-agent"],
|
|
17
|
+
});
|
|
18
|
+
};
|
|
19
|
+
exports.requestSerializer = requestSerializer;
|
|
20
|
+
const responseSerializer = (res) => ({
|
|
21
|
+
status: res.statusCode,
|
|
22
|
+
contentLength: res.raw.getHeader("content-length"),
|
|
23
|
+
});
|
|
24
|
+
exports.responseSerializer = responseSerializer;
|
|
25
|
+
const createRequestLogger = (nodeEnv, logger, stream) => {
|
|
26
|
+
const options = {
|
|
27
|
+
logger,
|
|
28
|
+
autoLogging: true,
|
|
29
|
+
level: "info",
|
|
30
|
+
messageKey: "message",
|
|
31
|
+
customLogLevel: (req, res, err) => {
|
|
32
|
+
if (res.statusCode >= 500 || err) {
|
|
33
|
+
return "error";
|
|
34
|
+
}
|
|
35
|
+
if (res.statusCode >= 400) {
|
|
36
|
+
return "warn";
|
|
37
|
+
}
|
|
38
|
+
return "info";
|
|
39
|
+
},
|
|
40
|
+
serializers: {
|
|
41
|
+
req: exports.requestSerializer,
|
|
42
|
+
res: exports.responseSerializer,
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
return stream ? (0, pino_http_1.default)(options, stream) : (0, pino_http_1.default)(options);
|
|
46
|
+
};
|
|
47
|
+
exports.createRequestLogger = createRequestLogger;
|
|
48
|
+
//# sourceMappingURL=RequestLoggerProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RequestLoggerProvider.js","sourceRoot":"","sources":["../../../src/helpers/logger/RequestLoggerProvider.ts"],"names":[],"mappings":";;;;;;AAEA,0DAAiC;AAU1B,MAAM,iBAAiB,GAAG,CAAC,GAAiD,EAAE,EAAE;;IAAC,OAAA,CAAC;QACrF,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW;QAChC,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,MAAM,EAAE,CAAA,MAAA,GAAG,CAAC,GAAG,CAAC,OAAO,0CAAE,IAAI,EAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;QAC9D,aAAa,EAAE,GAAG,CAAC,aAAa;QAChC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;KACvC,CAAC,CAAA;CAAA,CAAC;AAPU,QAAA,iBAAiB,qBAO3B;AAEI,MAAM,kBAAkB,GAAG,CAAC,GAAuB,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,EAAE,GAAG,CAAC,UAAU;IACtB,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;CACrD,CAAC,CAAC;AAHU,QAAA,kBAAkB,sBAG5B;AAEI,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,MAAe,EAAE,MAA0B,EAAE,EAAE;IAChG,MAAM,OAAO,GAAG;QACZ,MAAM;QACN,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,SAAS;QACrB,cAAc,EAAE,CAAC,GAAoB,EAAE,GAAmB,EAAE,GAAQ,EAAE,EAAE;YACpE,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,EAAE;gBAC9B,OAAO,OAAO,CAAC;aAClB;YACD,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;gBACvB,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,WAAW,EAAE;YACT,GAAG,EAAE,yBAAiB;YACtB,GAAG,EAAE,0BAAkB;SAC1B;KACJ,CAAC;IAEF,OAAO,MAAM,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,OAAO,CAAC,CAAC;AAClE,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./LoggerProvider"), exports);
|
|
18
|
+
__exportStar(require("./RequestLoggerProvider"), exports);
|
|
19
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/helpers/logger/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,0DAAwC"}
|
|
@@ -60,7 +60,7 @@ class MyAMQP {
|
|
|
60
60
|
.on("close", () => __awaiter(this, void 0, void 0, function* () {
|
|
61
61
|
helpers_1.log.warn("RabbitMQ Connection closed");
|
|
62
62
|
if (!this.gracefulShutdown) {
|
|
63
|
-
errors_1.ErrorHandler.handle(new errors_1.CustomError("[AMQP] Connection closed", false, this.constructor.name, 1001));
|
|
63
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError("[AMQP] Connection closed", false, this.constructor.name, 1001), helpers_1.log);
|
|
64
64
|
}
|
|
65
65
|
}));
|
|
66
66
|
this.channel = yield this.connection.createChannel();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/input-gateway/connectors/AMQPConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA4D;AAC5D,sDAA8B;AAC9B,sCAAoC;AACpC,wCAAkC;AAClC,uHAA0F;AAE1F;;GAEG;AACH,MAAM,MAAM;IAYR;;OAEG;IACH;QAgFO,gBAAW,GAAG,GAA2B,EAAE;;YAC9C,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,aAAa,CAAC,eAAM,CAAC,oBAAqB,CAAC,CAAA,CAAC,CAAC;QAC/E,CAAC,CAAA,CAAC;QAEK,eAAU,GAAG,GAAwB,EAAE;;YAC1C,aAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YACvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC7B,MAAM,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,EAAE,CAAA,CAAC;YAC5B,MAAM,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,KAAK,EAAE,CAAA,CAAC;QACnC,CAAC,CAAA,CAAC;QAxFE,IAAI,CAAC,uBAAuB,GAAG,eAAM,CAAC,kBAA8B,CAAC;QACrE,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACU,OAAO;;YAChB,IAAI;gBACA,IAAI,IAAI,CAAC,OAAO,EAAE;oBACd,OAAO,IAAI,CAAC,OAAO,CAAC;iBACvB;gBAED,IAAI,CAAC,UAAU,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;gBAE5F,IAAI,CAAC,UAAU;qBACV,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;oBACxB,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,CAAC;qBACD,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;oBACpB,aAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;oBACvC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBACxB,qBAAY,CAAC,MAAM,CAAC,IAAI,oBAAW,CAAC,0BAA0B,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/input-gateway/connectors/AMQPConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
2
|
import { EventEmitter } from "events";
|
|
4
3
|
import { Request } from "express";
|
|
5
4
|
declare enum LoggerEventType {
|
|
@@ -15,7 +14,7 @@ export interface INumberOfRecordsEventData {
|
|
|
15
14
|
req: Request;
|
|
16
15
|
numberOfRecords: number;
|
|
17
16
|
}
|
|
18
|
-
declare const logger: import("
|
|
19
|
-
declare const requestLogger:
|
|
17
|
+
declare const logger: import("../../helpers/logger").ILogger;
|
|
18
|
+
declare const requestLogger: import("pino-http").HttpLogger;
|
|
20
19
|
declare const loggerEvents: EventEmitter;
|
|
21
20
|
export { logger as log, loggerEvents, LoggerEventType, requestLogger };
|
|
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.requestLogger = exports.LoggerEventType = exports.loggerEvents = exports.log = void 0;
|
|
13
13
|
const errors_1 = require("@golemio/errors");
|
|
14
14
|
const events_1 = require("events");
|
|
15
|
-
const
|
|
15
|
+
const logger_1 = require("../../helpers/logger");
|
|
16
16
|
const config_1 = require("../config");
|
|
17
17
|
var LoggerEventType;
|
|
18
18
|
(function (LoggerEventType) {
|
|
@@ -20,13 +20,13 @@ var LoggerEventType;
|
|
|
20
20
|
LoggerEventType["NumberOfRecords"] = "number-of-records";
|
|
21
21
|
})(LoggerEventType || (LoggerEventType = {}));
|
|
22
22
|
exports.LoggerEventType = LoggerEventType;
|
|
23
|
-
const
|
|
23
|
+
const logger = (0, logger_1.createLogger)({
|
|
24
24
|
projectName: "input-gateway",
|
|
25
25
|
nodeEnv: config_1.config.node_env,
|
|
26
26
|
logLevel: config_1.config.log_level,
|
|
27
27
|
});
|
|
28
28
|
exports.log = logger;
|
|
29
|
-
const requestLogger = (0,
|
|
29
|
+
const requestLogger = (0, logger_1.createRequestLogger)(config_1.config.node_env, logger);
|
|
30
30
|
exports.requestLogger = requestLogger;
|
|
31
31
|
const loggerEvents = new events_1.EventEmitter();
|
|
32
32
|
exports.loggerEvents = loggerEvents;
|
|
@@ -37,6 +37,6 @@ loggerEvents.on(LoggerEventType.NumberOfRecords, ({ req, numberOfRecords }) => _
|
|
|
37
37
|
logger.verbose(`NumberOfRecordsLogger: ${req.method} ${req.originalUrl} : ${numberOfRecords}`);
|
|
38
38
|
}));
|
|
39
39
|
loggerEvents.on("error", (error) => {
|
|
40
|
-
errors_1.ErrorHandler.handle(error);
|
|
40
|
+
errors_1.ErrorHandler.handle(error, logger);
|
|
41
41
|
});
|
|
42
42
|
//# sourceMappingURL=Logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/input-gateway/helpers/Logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA4D;AAC5D,mCAAsC;AAEtC,iDAAoE;AACpE,sCAAoC;AAEpC,IAAK,eAGJ;AAHD,WAAK,eAAe;IAChB,6DAA0C,CAAA;IAC1C,wDAAqC,CAAA;AACzC,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAkCqC,0CAAe;AArBrD,MAAM,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/input-gateway/helpers/Logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA4D;AAC5D,mCAAsC;AAEtC,iDAAoE;AACpE,sCAAoC;AAEpC,IAAK,eAGJ;AAHD,WAAK,eAAe;IAChB,6DAA0C,CAAA;IAC1C,wDAAqC,CAAA;AACzC,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAkCqC,0CAAe;AArBrD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC;IACxB,WAAW,EAAE,eAAe;IAC5B,OAAO,EAAE,eAAM,CAAC,QAAQ;IACxB,QAAQ,EAAE,eAAM,CAAC,SAAS;CAC7B,CAAC,CAAC;AAiBgB,qBAAG;AAftB,MAAM,aAAa,GAAG,IAAA,4BAAmB,EAAC,eAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAeZ,sCAAa;AAdpE,MAAM,YAAY,GAAG,IAAI,qBAAY,EAAE,CAAC;AAchB,oCAAY;AAZpC,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,aAAa,EAAE,CAAO,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAA2B,EAAE,EAAE;IACvG,MAAM,CAAC,OAAO,CAAC,wBAAwB,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,MAAM,IAAI,IAAI,SAAS,IAAI,CAAC,CAAC;AACrG,CAAC,CAAA,CAAC,CAAC;AAEH,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,EAAE,CAAO,EAAE,GAAG,EAAE,eAAe,EAA6B,EAAE,EAAE;IAC3G,MAAM,CAAC,OAAO,CAAC,0BAA0B,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,MAAM,eAAe,EAAE,CAAC,CAAC;AACnG,CAAC,CAAA,CAAC,CAAC;AAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAA0B,EAAE,EAAE;IACpD,qBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}
|
|
@@ -51,7 +51,7 @@ const saveRawDataMiddleware = (req, res, next) => {
|
|
|
51
51
|
const ext = helpers_1.contentTypeToExtension[contentType];
|
|
52
52
|
// content-type checking
|
|
53
53
|
if (!ext) {
|
|
54
|
-
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Saving raw data failed. (${requestUrlPath})`, true, "SaveRawDataMiddleware", 406, new Error(`Extension for content-type ${contentType} was not found.`)));
|
|
54
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Saving raw data failed. (${requestUrlPath})`, true, "SaveRawDataMiddleware", 406, new Error(`Extension for content-type ${contentType} was not found.`)), helpers_1.log);
|
|
55
55
|
return next();
|
|
56
56
|
}
|
|
57
57
|
// save file with body of the matched route
|
|
@@ -84,7 +84,7 @@ exports.saveRawDataMiddleware = saveRawDataMiddleware;
|
|
|
84
84
|
const uploadDataToS3 = (data, options, requestUrlPath) => {
|
|
85
85
|
s3.upload(data, options, (err, _data) => {
|
|
86
86
|
if (err) {
|
|
87
|
-
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Uploading data failed to S3 failed. (${requestUrlPath})`, true, "SaveRawDataMiddleware", err.statusCode, err));
|
|
87
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Uploading data failed to S3 failed. (${requestUrlPath})`, true, "SaveRawDataMiddleware", err.statusCode, err), helpers_1.log);
|
|
88
88
|
}
|
|
89
89
|
}).on("httpUploadProgress", (httpUploadProgress) => {
|
|
90
90
|
helpers_1.log.debug(`S3 file upload progress: ${httpUploadProgress.loaded} / ${httpUploadProgress.total}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveRawDataMiddleware.js","sourceRoot":"","sources":["../../../src/input-gateway/helpers/SaveRawDataMiddleware.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA4D;AAC5D,qCAA6B;AAE7B,sEAAqC;AACrC,mDAA8C;AAC9C,sCAAoC;AACpC,gCAA0E;AAM1E,gCAAgC;AAChC,IAAI,kBAAkB,GAAG,EAAE,CAAC;AAC5B,IAAI,mBAAmB,GAAG,EAAE,CAAC;AAE7B,KAAK,MAAM,OAAO,IAAI,eAAM,CAAC,oBAAoB,EAAE;IAC/C,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACjC,kBAAkB,IAAI,GAAG,CAAC;KAC7B;IACD,MAAM,WAAW,GAAG,IAAI,IAAA,6BAAY,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;IAC9D,kBAAkB,IAAI,WAAW,CAAC;IAElC,IAAI,OAAO,CAAC,WAAW,EAAE;QACrB,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;YAClC,mBAAmB,IAAI,GAAG,CAAC;SAC9B;QACD,mBAAmB,IAAI,WAAW,CAAC;KACtC;CACJ;AAED,+CAA+C;AAClC,QAAA,YAAY,GAAG,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACrF,QAAA,aAAa,GAAG,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAErG,MAAM,EAAE,GAAG,IAAI,YAAE,CAAC;IACd,WAAW,EAAE,eAAM,CAAC,EAAE,CAAC,aAAa;IACpC,QAAQ,EAAE,eAAM,CAAC,EAAE,CAAC,QAAQ;IAC5B,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,eAAM,CAAC,EAAE,CAAC,iBAAiB;IAC5C,gBAAgB,EAAE,IAAI;CACzB,CAAC,CAAC;AAEH;;GAEG;AACI,MAAM,qBAAqB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACrF,MAAM,cAAc,GAAG,GAAG,CAAC,IAAI,CAAC;IAEhC,oGAAoG;IACpG,IAAI,eAAM,CAAC,EAAE,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,IAAI,oBAAY,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;QACjF,2GAA2G;QAC3G,MAAM,GAAG,GAAG,IAAA,yBAAM,GAAE,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACpG,iCAAiC;QACjC,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,GAAG,CAAwC,CAAC;QAC/E,MAAM,GAAG,GAAG,gCAAsB,CAAC,WAAW,CAAC,CAAC;QAEhD,wBAAwB;QACxB,IAAI,CAAC,GAAG,EAAE;YACN,qBAAY,CAAC,MAAM,CACf,IAAI,oBAAW,CACX,4BAA4B,cAAc,GAAG,EAC7C,IAAI,EACJ,uBAAuB,EACvB,GAAG,EACH,IAAI,KAAK,CAAC,8BAA8B,WAAW,iBAAiB,CAAC,CACxE,
|
|
1
|
+
{"version":3,"file":"SaveRawDataMiddleware.js","sourceRoot":"","sources":["../../../src/input-gateway/helpers/SaveRawDataMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ class MyAMQP {
|
|
|
36
36
|
.on("close", () => __awaiter(this, void 0, void 0, function* () {
|
|
37
37
|
helpers_1.log.warn("[AMQP] Connection closing.");
|
|
38
38
|
if (!this.gracefulShutdown) {
|
|
39
|
-
errors_1.ErrorHandler.handle(new errors_1.CustomError("[AMQP] Connection closed", false, this.constructor.name, 1001));
|
|
39
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError("[AMQP] Connection closed", false, this.constructor.name, 1001), helpers_1.log);
|
|
40
40
|
}
|
|
41
41
|
}));
|
|
42
42
|
this.channel = yield this.connection.createChannel();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/AMQPConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uHAA0F;AAC1F,sCAAoC;AACpC,wCAAkC;AAClC,4CAA4D;AAC5D,sDAA8B;AAE9B,MAAM,MAAM;IAKR;QAIO,YAAO,GAAG,GAAmC,EAAE;YAClD,IAAI;gBACA,IAAI,IAAI,CAAC,OAAO,EAAE;oBACd,OAAO,IAAI,CAAC,OAAO,CAAC;iBACvB;gBAED,IAAI,CAAC,eAAM,CAAC,WAAW,EAAE;oBACrB,MAAM,IAAI,oBAAW,CACjB,0DAA0D,EAC1D,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,IAAI,CACP,CAAC;iBACL;gBAED,IAAI,CAAC,UAAU,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,eAAM,CAAC,WAAW,CAAC,CAAC;gBAE5D,IAAI,CAAC,UAAU;qBACV,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;oBACxB,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,CAAC;qBACD,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;oBACpB,aAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;oBACvC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBACxB,qBAAY,CAAC,MAAM,CAAC,IAAI,oBAAW,CAAC,0BAA0B,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/AMQPConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uHAA0F;AAC1F,sCAAoC;AACpC,wCAAkC;AAClC,4CAA4D;AAC5D,sDAA8B;AAE9B,MAAM,MAAM;IAKR;QAIO,YAAO,GAAG,GAAmC,EAAE;YAClD,IAAI;gBACA,IAAI,IAAI,CAAC,OAAO,EAAE;oBACd,OAAO,IAAI,CAAC,OAAO,CAAC;iBACvB;gBAED,IAAI,CAAC,eAAM,CAAC,WAAW,EAAE;oBACrB,MAAM,IAAI,oBAAW,CACjB,0DAA0D,EAC1D,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,IAAI,CACP,CAAC;iBACL;gBAED,IAAI,CAAC,UAAU,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,eAAM,CAAC,WAAW,CAAC,CAAC;gBAE5D,IAAI,CAAC,UAAU;qBACV,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;oBACxB,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,CAAC;qBACD,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;oBACpB,aAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;oBACvC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBACxB,qBAAY,CAAC,MAAM,CAAC,IAAI,oBAAW,CAAC,0BAA0B,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,aAAG,CAAC,CAAC;qBAC7G;gBACL,CAAC,CAAA,CAAC,CAAC;gBAEP,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;gBAErD,IAAI,CAAC,OAAO;qBACP,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBACjB,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,CAAC;qBACD,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;;oBACd,aAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;oBACpC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;wBACxB,MAAA,IAAI,CAAC,UAAU,0CAAE,KAAK,EAAE,CAAC;qBAC5B;gBACL,CAAC,CAAC,CAAC;gBAEP,aAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;gBAEvC,MAAM,kCAAwB,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,eAAM,CAAC,oBAAqB,CAAC,CAAC;gBACnG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEzC,2DAA2D;gBAC3D,2BAA2B;gBAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAM,CAAC,iCAAiC,CAAC,CAAC;gBAEtE,OAAO,IAAI,CAAC,OAAO,CAAC;aACvB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,oBAAW,CAAC,2CAA2C,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aAC/G;QACL,CAAC,CAAA,CAAC;QAEK,eAAU,GAAG,GAAoB,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACf,MAAM,IAAI,oBAAW,CACjB,6DAA6D,EAC7D,KAAK,EACL,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,IAAI,CACP,CAAC;aACL;YACD,OAAO,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC,CAAC;QAEK,gBAAW,GAAG,CAAO,GAAW,EAAE,GAAW,EAAE,UAAmC,EAAE,EAAoB,EAAE;YAC7G,IAAI;gBACA,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;gBAC3C,MAAM,OAAO,CAAC,cAAc,CAAC,eAAM,CAAC,oBAAqB,EAAE,OAAO,EAAE;oBAChE,OAAO,EAAE,KAAK;oBACd,iBAAiB,EAAE,kCAAwB,CAAC,kBAAkB,CAAC,eAAM,CAAC,oBAAqB,CAAC;iBAC/F,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,OAAO,CAAC,eAAM,CAAC,oBAAqB,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;aACxF;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,oBAAW,CAAC,yCAAyC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aAC5G;QACL,CAAC,CAAA,CAAC;QAEM,oBAAe,GAAG,CAAO,OAAwB,EAAiB,EAAE;YACxE,IAAI,CAAC,eAAM,CAAC,oBAAoB,EAAE;gBAC9B,MAAM,IAAI,oBAAW,CACjB,mEAAmE,EACnE,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,IAAI,CACP,CAAC;aACL;YAED,MAAM,OAAO,CAAC,cAAc,CAAC,eAAM,CAAC,oBAAoB,EAAE,OAAO,EAAE;gBAC/D,OAAO,EAAE,KAAK;gBACd,iBAAiB,EAAE,kCAAwB,CAAC,kBAAkB,CAAC,eAAM,CAAC,oBAAqB,CAAC;aAC/F,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,eAAM,CAAC,oBAAoB,GAAG,YAAY,EAAE;gBAC5E,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,yBAAyB;aACjE,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,eAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;QAC1E,CAAC,CAAA,CAAC;QAEK,gBAAW,GAAG,GAA2B,EAAE;;YAC9C,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,aAAa,CAAC,eAAM,CAAC,oBAAqB,CAAC,CAAA,CAAC,CAAC;QAC/E,CAAC,CAAA,CAAC;QAEK,eAAU,GAAG,GAAwB,EAAE;;YAC1C,aAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC7B,MAAM,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,EAAE,CAAA,CAAC;YAC5B,MAAM,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,KAAK,EAAE,CAAA,CAAC;QACnC,CAAC,CAAA,CAAC;QAlHE,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;IAClC,CAAC;CAkHJ;AAED,MAAM,aAAa,GAAG,IAAI,MAAM,EAAE,CAAC;AAE1B,sCAAa"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
2
|
import { EventEmitter } from "events";
|
|
4
3
|
declare enum LoggerEventType {
|
|
5
4
|
NumberOfRecords = "number-of-records",
|
|
6
5
|
PostgresErrorLog = "postgres-error-log"
|
|
7
6
|
}
|
|
8
|
-
declare const logger: import("
|
|
9
|
-
declare const requestLogger:
|
|
7
|
+
declare const logger: import("../../helpers/logger").ILogger;
|
|
8
|
+
declare const requestLogger: import("pino-http").HttpLogger;
|
|
10
9
|
declare const loggerEvents: EventEmitter;
|
|
11
10
|
export { logger as log, loggerEvents, LoggerEventType, requestLogger };
|
|
@@ -13,7 +13,7 @@ exports.requestLogger = exports.LoggerEventType = exports.loggerEvents = exports
|
|
|
13
13
|
const errors_1 = require("@golemio/errors");
|
|
14
14
|
const validator_1 = require("@golemio/validator");
|
|
15
15
|
const events_1 = require("events");
|
|
16
|
-
const
|
|
16
|
+
const logger_1 = require("../../helpers/logger");
|
|
17
17
|
const ErrorLog_1 = require("../../schema-definitions/ErrorLog");
|
|
18
18
|
const config_1 = require("../config");
|
|
19
19
|
const models_1 = require("../models");
|
|
@@ -23,13 +23,13 @@ var LoggerEventType;
|
|
|
23
23
|
LoggerEventType["PostgresErrorLog"] = "postgres-error-log";
|
|
24
24
|
})(LoggerEventType || (LoggerEventType = {}));
|
|
25
25
|
exports.LoggerEventType = LoggerEventType;
|
|
26
|
-
const
|
|
26
|
+
const logger = (0, logger_1.createLogger)({
|
|
27
27
|
projectName: "integration-engine",
|
|
28
28
|
nodeEnv: config_1.config.NODE_ENV,
|
|
29
29
|
logLevel: config_1.config.LOG_LEVEL,
|
|
30
30
|
});
|
|
31
31
|
exports.log = logger;
|
|
32
|
-
const requestLogger = (0,
|
|
32
|
+
const requestLogger = (0, logger_1.createRequestLogger)(config_1.config.NODE_ENV, logger);
|
|
33
33
|
exports.requestLogger = requestLogger;
|
|
34
34
|
const loggerEvents = new events_1.EventEmitter();
|
|
35
35
|
exports.loggerEvents = loggerEvents;
|
|
@@ -37,7 +37,7 @@ loggerEvents.on(LoggerEventType.NumberOfRecords, ({ name, numberOfRecords }) =>
|
|
|
37
37
|
logger.verbose(`NumberOfRecordsLogger: ${name} : ${numberOfRecords}`);
|
|
38
38
|
}));
|
|
39
39
|
loggerEvents.on("error", (error) => {
|
|
40
|
-
errors_1.ErrorHandler.handle(error);
|
|
40
|
+
errors_1.ErrorHandler.handle(error, logger);
|
|
41
41
|
});
|
|
42
42
|
/**
|
|
43
43
|
* Postgres Error Log Model
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/Logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA4D;AAC5D,kDAA+C;AAC/C,mCAAsC;AACtC,iDAAoE;AACpE,gEAAyC;AACzC,sCAAoC;AACpC,sCAA2C;AAW3C,IAAK,eAGJ;AAHD,WAAK,eAAe;IAChB,wDAAqC,CAAA;IACrC,0DAAuC,CAAA;AAC3C,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAoEqC,0CAAe;AA7DrD,MAAM,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/Logger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA4D;AAC5D,kDAA+C;AAC/C,mCAAsC;AACtC,iDAAoE;AACpE,gEAAyC;AACzC,sCAAoC;AACpC,sCAA2C;AAW3C,IAAK,eAGJ;AAHD,WAAK,eAAe;IAChB,wDAAqC,CAAA;IACrC,0DAAuC,CAAA;AAC3C,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAoEqC,0CAAe;AA7DrD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC;IACxB,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,eAAM,CAAC,QAAQ;IACxB,QAAQ,EAAE,eAAM,CAAC,SAAS;CAC7B,CAAC,CAAC;AAyDgB,qBAAG;AAvDtB,MAAM,aAAa,GAAG,IAAA,4BAAmB,EAAC,eAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAuDZ,sCAAa;AAtDpE,MAAM,YAAY,GAAG,IAAI,qBAAY,EAAE,CAAC;AAsDhB,oCAAY;AApDpC,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,EAAE,CAAO,EAAE,IAAI,EAAE,eAAe,EAAwC,EAAE,EAAE;IACvH,MAAM,CAAC,OAAO,CAAC,0BAA0B,IAAI,MAAM,eAAe,EAAE,CAAC,CAAC;AAC1E,CAAC,CAAA,CAAC,CAAC;AAEH,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAA0B,EAAE,EAAE;IACpD,qBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,IAAI,eAA8B,CAAC;AAEnC;;GAEG;AACH,YAAY,CAAC,EAAE,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAO,EAAE,KAAK,EAAkC,EAAE,EAAE;IAClG,IAAI,CAAC,eAAe,EAAE;QAClB,eAAe,GAAG,IAAI,sBAAa,CAC/B,mBAAQ,CAAC,IAAI,GAAG,OAAO,EACvB;YACI,yBAAyB,EAAE,mBAAQ,CAAC,yBAAyB;YAC7D,WAAW,EAAE,mBAAQ,CAAC,WAAW;YACjC,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,qBAAS,CAAC,mBAAQ,CAAC,IAAI,GAAG,gBAAgB,EAAE,mBAAQ,CAAC,0BAA0B,CAAC,CACvF,CAAC;KACL;IAED,IAAI;QACA,MAAM,eAAe,GAAqB;YACtC,UAAU,EAAE,IAAI;YAChB,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,oBAAoB;YAC7B,WAAW,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI;YAChC,MAAM,EAAE,IAAI;SACf,CAAC;QAEF,IAAI,KAAK,YAAY,oBAAW,EAAE;YAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrC,eAAe,CAAC,UAAU,GAAG,WAAW,CAAC,gBAAgB,IAAI,IAAI,CAAC;YAClE,eAAe,CAAC,IAAI,GAAG,WAAW,CAAC,UAAU,IAAI,IAAI,CAAC;YACtD,eAAe,CAAC,MAAM,GAAG,WAAW,CAAC,YAAY,IAAI,IAAI,CAAC;SAC7D;QAED,MAAM,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;KAC/C;IAAC,OAAO,GAAG,EAAE;QACV,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC1B;AACL,CAAC,CAAA,CAAC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
declare const
|
|
3
|
-
declare const requestLogger: (req: import("http").IncomingMessage, res: import("http").ServerResponse, callback: (err?: Error | undefined) => void) => void;
|
|
1
|
+
declare const logger: import("../helpers/logger").ILogger;
|
|
2
|
+
declare const requestLogger: import("pino-http").HttpLogger;
|
|
4
3
|
export { logger as log, requestLogger };
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.requestLogger = exports.log = void 0;
|
|
4
|
-
const
|
|
4
|
+
const logger_1 = require("../helpers/logger");
|
|
5
5
|
const config_1 = require("./config");
|
|
6
|
-
const
|
|
6
|
+
const logger = (0, logger_1.createLogger)({
|
|
7
7
|
projectName: "output-gateway",
|
|
8
8
|
nodeEnv: config_1.config.node_env,
|
|
9
9
|
logLevel: config_1.config.log_level,
|
|
10
10
|
});
|
|
11
11
|
exports.log = logger;
|
|
12
|
-
const requestLogger = (0,
|
|
12
|
+
const requestLogger = (0, logger_1.createRequestLogger)(config_1.config.node_env, logger);
|
|
13
13
|
exports.requestLogger = requestLogger;
|
|
14
14
|
//# sourceMappingURL=Logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/output-gateway/Logger.ts"],"names":[],"mappings":";;;AAAA,8CAAoE;AACpE,qCAAoC;AAEpC,MAAM,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/output-gateway/Logger.ts"],"names":[],"mappings":";;;AAAA,8CAAoE;AACpE,qCAAoC;AAEpC,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC;IACxB,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,eAAM,CAAC,QAAQ;IACxB,QAAQ,EAAE,eAAM,CAAC,SAAS;CAC7B,CAAC,CAAC;AAIgB,qBAAG;AAFtB,MAAM,aAAa,GAAG,IAAA,4BAAmB,EAAC,eAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAE3C,sCAAa"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/core",
|
|
3
|
-
"version": "1.2.22-dev.
|
|
3
|
+
"version": "1.2.22-dev.694978995",
|
|
4
4
|
"description": "Golemio Core Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -38,11 +38,11 @@
|
|
|
38
38
|
"@types/debug": "0.0.31",
|
|
39
39
|
"@types/decompress": "^4.2.3",
|
|
40
40
|
"@types/mocha": "^8.2.0",
|
|
41
|
-
"@types/morgan": "^1.9.2",
|
|
42
41
|
"@types/node": "^16.11.35",
|
|
43
42
|
"@types/sinon": "7.0.13",
|
|
44
43
|
"@types/ssh2-sftp-client": "^5.3.1",
|
|
45
44
|
"@types/supertest": "^2.0.11",
|
|
45
|
+
"@types/uuid": "^8.3.4",
|
|
46
46
|
"chai": "4.2.0",
|
|
47
47
|
"chai-as-promised": "7.1.1",
|
|
48
48
|
"cross-env": "^7.0.3",
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@abraham/reflection": "^0.10.0",
|
|
68
68
|
"@azure/storage-blob": "^12.11.0",
|
|
69
|
-
"@golemio/errors": "^1.0.
|
|
69
|
+
"@golemio/errors": "^1.0.2-dev.693873522",
|
|
70
70
|
"@golemio/utils": "^1.0.0",
|
|
71
|
-
"@golemio/validator": "0.2.
|
|
71
|
+
"@golemio/validator": "0.2.5-dev.694882844",
|
|
72
72
|
"@google-cloud/storage": "^5.18.0",
|
|
73
73
|
"@opentelemetry/api": "1.0.4",
|
|
74
74
|
"@opentelemetry/exporter-jaeger": "^1.2.0",
|
|
@@ -111,11 +111,13 @@
|
|
|
111
111
|
"moment-timezone": "^0.5.26",
|
|
112
112
|
"mongodb-restore-dump": "1.0.1",
|
|
113
113
|
"mongoose": "^6.6.5",
|
|
114
|
-
"morgan": "^1.10.0",
|
|
115
114
|
"opentelemetry-instrumentation-mongoose": "^0.27.1",
|
|
116
115
|
"opentelemetry-instrumentation-sequelize": "^0.27.1",
|
|
117
116
|
"path-to-regexp": "^6.2.0",
|
|
118
117
|
"pg": "^8.6.0",
|
|
118
|
+
"pino": "^8.7.0",
|
|
119
|
+
"pino-http": "^8.2.1",
|
|
120
|
+
"pino-pretty": "^9.1.1",
|
|
119
121
|
"prom-client": "^14.0.0",
|
|
120
122
|
"redis": "^3.1.1",
|
|
121
123
|
"redis-semaphore": "^5.2.0",
|
|
@@ -123,7 +125,6 @@
|
|
|
123
125
|
"request-promise": "^4.2.5",
|
|
124
126
|
"sequelize": "^6.21.2",
|
|
125
127
|
"ssh2-sftp-client": "^7.1.0",
|
|
126
|
-
"winston": "^3.3.3",
|
|
127
128
|
"xml2js-es6-promise": "^1.1.1"
|
|
128
129
|
},
|
|
129
130
|
"resolutions": {}
|
package/dist/helpers/Logger.d.ts
DELETED
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
import winston from "winston";
|
|
3
|
-
import { IncomingMessage } from "http";
|
|
4
|
-
export declare type ILogger = winston.Logger;
|
|
5
|
-
interface ICreateLoggerArgs {
|
|
6
|
-
projectName: string;
|
|
7
|
-
nodeEnv: string;
|
|
8
|
-
logLevel?: string;
|
|
9
|
-
}
|
|
10
|
-
export declare type ExtendedRequest = IncomingMessage & {
|
|
11
|
-
session: {
|
|
12
|
-
user?: any;
|
|
13
|
-
};
|
|
14
|
-
};
|
|
15
|
-
/**
|
|
16
|
-
* Custom log formatter - to be consumed by winston.format.printf
|
|
17
|
-
*/
|
|
18
|
-
export declare const logFormat: (nodeEnv: ICreateLoggerArgs["nodeEnv"]) => (info: any) => string;
|
|
19
|
-
/**
|
|
20
|
-
* Create and configure a Winston logger
|
|
21
|
-
*/
|
|
22
|
-
export declare const createLogger: ({ projectName, nodeEnv, logLevel }: ICreateLoggerArgs) => {
|
|
23
|
-
logger: ILogger;
|
|
24
|
-
};
|
|
25
|
-
/**
|
|
26
|
-
* Custom log format string for request logger that will produce a log entry
|
|
27
|
-
*/
|
|
28
|
-
export declare const formatStr = ":remote-addr - :userId [:date[iso]] \":method :url HTTP/:http-version\" :status :res[content-length] \":referrer\" \":user-agent\"";
|
|
29
|
-
/**
|
|
30
|
-
* Create and configure a request logger
|
|
31
|
-
*/
|
|
32
|
-
export declare const createRequestLogger: (options?: {}) => (req: IncomingMessage, res: import("http").ServerResponse, callback: (err?: Error | undefined) => void) => void;
|
|
33
|
-
export {};
|
package/dist/helpers/Logger.js
DELETED
|
@@ -1,103 +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
|
-
exports.createRequestLogger = exports.formatStr = exports.createLogger = exports.logFormat = void 0;
|
|
7
|
-
const debug_1 = __importDefault(require("debug"));
|
|
8
|
-
const morgan_1 = __importDefault(require("morgan"));
|
|
9
|
-
const winston_1 = __importDefault(require("winston"));
|
|
10
|
-
const { timestamp, printf, colorize } = winston_1.default.format;
|
|
11
|
-
const formatCustomErrorLog = (err) => {
|
|
12
|
-
const obj = err.toObject();
|
|
13
|
-
return Object.assign(Object.assign(Object.assign(Object.assign({ message: obj.error_message }, (obj.error_class_name && { class_name: obj.error_class_name })), (obj.error_status && { status: obj.error_status })), (obj.error_info && { cause: obj.error_info })), (obj.stack_trace && { stack: obj.stack_trace }));
|
|
14
|
-
};
|
|
15
|
-
/**
|
|
16
|
-
* Custom log formatter - to be consumed by winston.format.printf
|
|
17
|
-
*/
|
|
18
|
-
const logFormat = (nodeEnv) => (info) => {
|
|
19
|
-
let logObj = {};
|
|
20
|
-
// info has toObject function (CustomError)
|
|
21
|
-
if (typeof info.toObject === "function") {
|
|
22
|
-
logObj = formatCustomErrorLog(info);
|
|
23
|
-
}
|
|
24
|
-
// info has a stack trace (TypeError, generic Error, etc.)
|
|
25
|
-
else if (typeof info.stack === "string") {
|
|
26
|
-
logObj = {
|
|
27
|
-
message: info.message,
|
|
28
|
-
stack: info.stack,
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
if (typeof info.message === "object") {
|
|
33
|
-
logObj = info.message;
|
|
34
|
-
}
|
|
35
|
-
else if (typeof info.message === "string" || typeof info.message === "number") {
|
|
36
|
-
logObj = { message: info.message };
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
39
|
-
logObj = info;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
if (nodeEnv === "development" || nodeEnv === "test") {
|
|
43
|
-
return `[${info.timestamp}] [${info.level}]: ${JSON.stringify(logObj)}`;
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
return JSON.stringify(Object.assign(Object.assign({}, logObj), { level: info.level }));
|
|
47
|
-
}
|
|
48
|
-
};
|
|
49
|
-
exports.logFormat = logFormat;
|
|
50
|
-
/**
|
|
51
|
-
* Create and configure a Winston logger
|
|
52
|
-
*/
|
|
53
|
-
const createLogger = ({ projectName, nodeEnv, logLevel }) => {
|
|
54
|
-
let setFormat;
|
|
55
|
-
if (nodeEnv === "development" || nodeEnv === "test") {
|
|
56
|
-
setFormat = winston_1.default.format.combine(timestamp(), colorize(), printf((0, exports.logFormat)(nodeEnv)));
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
setFormat = winston_1.default.format.combine(timestamp(), printf((0, exports.logFormat)(nodeEnv)));
|
|
60
|
-
}
|
|
61
|
-
const logger = winston_1.default.createLogger({
|
|
62
|
-
format: setFormat,
|
|
63
|
-
transports: [new winston_1.default.transports.Console({ level: (logLevel === null || logLevel === void 0 ? void 0 : logLevel.toLowerCase()) || "info" })],
|
|
64
|
-
});
|
|
65
|
-
const debugLog = (0, debug_1.default)(`golemio:${projectName}:debug`);
|
|
66
|
-
const sillyLog = (0, debug_1.default)(`golemio:${projectName}:silly`);
|
|
67
|
-
const winstonDebugLog = logger.debug;
|
|
68
|
-
const winstonSillyLog = logger.silly;
|
|
69
|
-
// Log all "SILLY" logs to debug module as well
|
|
70
|
-
logger.silly = (logText) => {
|
|
71
|
-
sillyLog(logText);
|
|
72
|
-
winstonSillyLog(logText);
|
|
73
|
-
};
|
|
74
|
-
// Log all "DEBUG" to debug module as well
|
|
75
|
-
logger.debug = (logText) => {
|
|
76
|
-
debugLog(logText);
|
|
77
|
-
winstonDebugLog(logText);
|
|
78
|
-
};
|
|
79
|
-
return {
|
|
80
|
-
logger,
|
|
81
|
-
};
|
|
82
|
-
};
|
|
83
|
-
exports.createLogger = createLogger;
|
|
84
|
-
/**
|
|
85
|
-
* Custom token for request logger
|
|
86
|
-
*/
|
|
87
|
-
morgan_1.default.token("userId", (req) => {
|
|
88
|
-
if (req.session && req.session.user) {
|
|
89
|
-
return req.session.user.id;
|
|
90
|
-
}
|
|
91
|
-
return null;
|
|
92
|
-
});
|
|
93
|
-
/**
|
|
94
|
-
* Custom log format string for request logger that will produce a log entry
|
|
95
|
-
*/
|
|
96
|
-
exports.formatStr = `:remote-addr - :userId [:date[iso]] ":method :url\
|
|
97
|
-
HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"`;
|
|
98
|
-
/**
|
|
99
|
-
* Create and configure a request logger
|
|
100
|
-
*/
|
|
101
|
-
const createRequestLogger = (options = {}) => (0, morgan_1.default)(exports.formatStr, options);
|
|
102
|
-
exports.createRequestLogger = createRequestLogger;
|
|
103
|
-
//# sourceMappingURL=Logger.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/helpers/Logger.ts"],"names":[],"mappings":"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"}
|