stentor-logger 1.59.143 → 1.60.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/lib/logger.js +15 -15
- package/lib/logger.js.map +1 -1
- package/package.json +9 -9
package/lib/logger.js
CHANGED
|
@@ -23,23 +23,23 @@ function redact(info) {
|
|
|
23
23
|
}
|
|
24
24
|
// Make a copy so we don't modify the original
|
|
25
25
|
const copy = Object.assign({}, info);
|
|
26
|
+
let partial = process.env.OVAI_LOG_PII_MASK_PARTIAL === "true";
|
|
27
|
+
if (partial) {
|
|
28
|
+
console.warn(`OVAI_LOG_PII_MASK_PARTIAL is now deprecated, please update to use STENTOR_LOG_PII_MASK_PARTIAL instead.`);
|
|
29
|
+
}
|
|
30
|
+
// Override the deprecated one if the real one exists.
|
|
31
|
+
if (process.env.STENTOR_LOG_PII_MASK_PARTIAL) {
|
|
32
|
+
partial = process.env.STENTOR_LOG_PII_MASK_PARTIAL === "true";
|
|
33
|
+
}
|
|
26
34
|
let message = copy.message;
|
|
27
35
|
if (typeof message === "string") {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
console.warn(`OVAI_LOG_PII_MASK_PARTIAL is now deprecated, please update to use STENTOR_LOG_PII_MASK_PARTIAL instead.`);
|
|
31
|
-
}
|
|
32
|
-
// Override the deprecated one if the real one exists.
|
|
33
|
-
if (process.env.STENTOR_LOG_PII_MASK_PARTIAL) {
|
|
34
|
-
partial = process.env.STENTOR_LOG_PII_MASK_PARTIAL === "true";
|
|
35
|
-
}
|
|
36
|
-
message = (0, stentor_utils_1.maskEmails)(message, partial);
|
|
37
|
-
message = (0, stentor_utils_1.maskPhoneNumbers)(message, partial);
|
|
36
|
+
const emailsMasked = (0, stentor_utils_1.maskEmails)(message, partial);
|
|
37
|
+
message = (0, stentor_utils_1.maskPhoneNumbers)(emailsMasked, partial);
|
|
38
38
|
}
|
|
39
39
|
else if (typeof message === "object") {
|
|
40
|
-
let asString = JSON.stringify(
|
|
41
|
-
|
|
42
|
-
asString = (0, stentor_utils_1.maskPhoneNumbers)(
|
|
40
|
+
let asString = JSON.stringify(message);
|
|
41
|
+
const emailsMasked = (0, stentor_utils_1.maskEmails)(asString, partial);
|
|
42
|
+
asString = (0, stentor_utils_1.maskPhoneNumbers)(emailsMasked, partial);
|
|
43
43
|
try {
|
|
44
44
|
message = JSON.parse(asString);
|
|
45
45
|
}
|
|
@@ -75,7 +75,7 @@ function log() {
|
|
|
75
75
|
if (!LOGGER) {
|
|
76
76
|
const level = process.env.STENTOR_LOG_LEVEL || process.env.OVAI_LOG_LEVEL || "error";
|
|
77
77
|
LOGGER = (0, winston_1.createLogger)({
|
|
78
|
-
format: winston_1.format.combine((0, winston_1.format)(redact)(), winston_1.format.prettyPrint(), winston_1.format.splat(), winston_1.format.timestamp(), winston_1.format.printf(info => {
|
|
78
|
+
format: winston_1.format.combine((0, winston_1.format)(redact)(), winston_1.format.prettyPrint(), winston_1.format.splat(), winston_1.format.timestamp(), winston_1.format.printf((info) => {
|
|
79
79
|
if (info.message && info.message.constructor === Object) {
|
|
80
80
|
// for AWS, if you pretty print then it takes up new lines in CloudWatch, which pollutes
|
|
81
81
|
// your log messages so we check to see if we are in a lambda runtime
|
|
@@ -109,7 +109,7 @@ function log() {
|
|
|
109
109
|
// CloudWatch automatically includes the timestamp, it isn't needed
|
|
110
110
|
return `${lead}|${info.message}`;
|
|
111
111
|
}
|
|
112
|
-
else {
|
|
112
|
+
else if (typeof info.timestamp === "string") {
|
|
113
113
|
// outside, just print the time mm
|
|
114
114
|
const time = new Date(info.timestamp).toLocaleTimeString([], {
|
|
115
115
|
minute: '2-digit',
|
package/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";AAAA,oCAAoC;;AAyBpC,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "1.
|
|
7
|
+
"version": "1.60.1",
|
|
8
8
|
"description": "Simple logging library built on top of Winston for 📣 stentor",
|
|
9
9
|
"types": "lib/index",
|
|
10
10
|
"main": "lib/index",
|
|
@@ -12,30 +12,30 @@
|
|
|
12
12
|
"lib"
|
|
13
13
|
],
|
|
14
14
|
"engines": {
|
|
15
|
-
"node": "^12 || ^14 || ^16 || ^18 || ^20.0.0"
|
|
15
|
+
"node": "^12 || ^14 || ^16 || ^18 || ^20.0.0 || ^22.0.0"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
|
-
"@types/mocha": "
|
|
18
|
+
"@types/mocha": "10.0.10",
|
|
19
19
|
"@types/sinon": "17.0.3",
|
|
20
20
|
"@types/sinon-chai": "3.2.12",
|
|
21
21
|
"@xapp/config": "0.2.3",
|
|
22
22
|
"chai": "4.5.0",
|
|
23
|
-
"mocha": "11.0
|
|
23
|
+
"mocha": "11.1.0",
|
|
24
24
|
"sinon": "19.0.2",
|
|
25
25
|
"sinon-chai": "3.7.0",
|
|
26
|
-
"stentor-models": "1.
|
|
26
|
+
"stentor-models": "1.60.1",
|
|
27
27
|
"ts-node": "10.9.2",
|
|
28
|
-
"typescript": "5.
|
|
28
|
+
"typescript": "5.7.3"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"chalk": "4.1.2",
|
|
32
|
-
"stentor-utils": "1.
|
|
33
|
-
"winston": "3.
|
|
32
|
+
"stentor-utils": "1.60.1",
|
|
33
|
+
"winston": "3.17.0"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|
|
36
36
|
"build": "tsc -d true -p .",
|
|
37
37
|
"clean": "rm -rf ./lib/*",
|
|
38
38
|
"test": "mocha --recursive -r ts-node/register \"./src/**/*.test.ts\""
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "bc5a0a7d9e22f85d95fe3f8e21879839431a29f5"
|
|
41
41
|
}
|