http-system-logger 1.0.12 → 1.0.14
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/morgan.config.d.ts +1 -1
- package/dist/morgan.config.js +18 -23
- package/package.json +1 -1
package/dist/morgan.config.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/// <reference types="qs" />
|
|
2
|
-
import { Request, Response } from
|
|
2
|
+
import { Request, Response } from "express";
|
|
3
3
|
declare const morganMiddleware: (req: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>>, callback: (err?: Error | undefined) => void) => void;
|
|
4
4
|
export default morganMiddleware;
|
package/dist/morgan.config.js
CHANGED
|
@@ -29,24 +29,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
const morgan_1 = __importDefault(require("morgan"));
|
|
30
30
|
const winston_config_1 = require("./winston.config");
|
|
31
31
|
const uuid = __importStar(require("uuid"));
|
|
32
|
-
const ignoredRoutesRaw = (process.env.IGNORED_ROUTES || '/api/health')
|
|
33
|
-
.split(',')
|
|
34
|
-
.map((route) => route.trim());
|
|
35
|
-
const ignoredRoutesExact = ignoredRoutesRaw.filter(route => !route.includes('*'));
|
|
36
|
-
const ignoredRoutesRegex = ignoredRoutesRaw
|
|
37
|
-
.filter(route => route.includes('*'))
|
|
38
|
-
.map(route => new RegExp('^' + route.replace(/\*/g, '.*') + '$'));
|
|
39
|
-
console.log('Exact matches:', ignoredRoutesExact);
|
|
40
|
-
console.log('Regex matches:', ignoredRoutesRegex);
|
|
41
|
-
function isIgnoredRoute(path) {
|
|
42
|
-
console.log('Checking ignored routes for path:', path);
|
|
43
|
-
console.log('Exact matches:', ignoredRoutesExact);
|
|
44
|
-
console.log('Regex matches:', ignoredRoutesRegex);
|
|
45
|
-
if (ignoredRoutesExact.includes(path))
|
|
46
|
-
return true;
|
|
47
|
-
return ignoredRoutesRegex.some(regex => regex.test(path));
|
|
48
|
-
}
|
|
49
32
|
const morganMiddleware = (0, morgan_1.default)(function (tokens, req, res) {
|
|
33
|
+
const ignoredRoutesRaw = (process.env.IGNORED_ROUTES || "/api/health")
|
|
34
|
+
.split(",")
|
|
35
|
+
.map((route) => route.trim());
|
|
36
|
+
const ignoredRoutesExact = ignoredRoutesRaw.filter((route) => !route.includes("*"));
|
|
37
|
+
const ignoredRoutesRegex = ignoredRoutesRaw
|
|
38
|
+
.filter((route) => route.includes("*"))
|
|
39
|
+
.map((route) => new RegExp("^" + route.replace(/\*/g, ".*") + "$"));
|
|
40
|
+
function isIgnoredRoute(path) {
|
|
41
|
+
if (ignoredRoutesExact.includes(path))
|
|
42
|
+
return true;
|
|
43
|
+
return ignoredRoutesRegex.some((regex) => regex.test(path));
|
|
44
|
+
}
|
|
50
45
|
if (isIgnoredRoute(req.path)) {
|
|
51
46
|
return null; // Skip logging for ignored routes
|
|
52
47
|
}
|
|
@@ -54,19 +49,19 @@ const morganMiddleware = (0, morgan_1.default)(function (tokens, req, res) {
|
|
|
54
49
|
method: tokens.method(req, res),
|
|
55
50
|
url: tokens.url(req, res),
|
|
56
51
|
status: Number.parseFloat(tokens.status(req, res)),
|
|
57
|
-
content_length: tokens.res(req, res,
|
|
58
|
-
response_time: Number.parseFloat(tokens[
|
|
59
|
-
http_version: tokens[
|
|
60
|
-
user_agent: tokens[
|
|
52
|
+
content_length: tokens.res(req, res, "content-length"),
|
|
53
|
+
response_time: Number.parseFloat(tokens["response-time"](req, res)),
|
|
54
|
+
http_version: tokens["http-version"](req, res),
|
|
55
|
+
user_agent: tokens["user-agent"](req, res),
|
|
61
56
|
request_body: req.body,
|
|
62
|
-
id: tokens.req(req, res,
|
|
57
|
+
id: tokens.req(req, res, "x-request-id") || uuid.v4(),
|
|
63
58
|
});
|
|
64
59
|
}, {
|
|
65
60
|
stream: {
|
|
66
61
|
// Configure Morgan to use our custom logger with the http severity
|
|
67
62
|
write: (message) => {
|
|
68
63
|
if (message) {
|
|
69
|
-
(0, winston_config_1.getLogger)().http(message, { context:
|
|
64
|
+
(0, winston_config_1.getLogger)().http(message, { context: "HttpContext" });
|
|
70
65
|
}
|
|
71
66
|
},
|
|
72
67
|
},
|
package/package.json
CHANGED