stentor-logger 1.56.11 → 1.56.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/lib/logger.js +30 -5
- package/lib/logger.js.map +1 -1
- package/package.json +4 -4
package/lib/logger.js
CHANGED
|
@@ -60,6 +60,9 @@ function redact(info) {
|
|
|
60
60
|
return info;
|
|
61
61
|
}
|
|
62
62
|
exports.redact = redact;
|
|
63
|
+
function isOnAWSLambda() {
|
|
64
|
+
return !!process.env.AWS_LAMBDA_FUNCTION_NAME;
|
|
65
|
+
}
|
|
63
66
|
/**
|
|
64
67
|
* Get an instance of the shared logger.
|
|
65
68
|
*
|
|
@@ -71,7 +74,14 @@ function log() {
|
|
|
71
74
|
LOGGER = (0, winston_1.createLogger)({
|
|
72
75
|
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 => {
|
|
73
76
|
if (info.message && info.message.constructor === Object) {
|
|
74
|
-
|
|
77
|
+
// for AWS, if you pretty print then it takes up new lines in CloudWatch, which pollutes
|
|
78
|
+
// your log messages so we check to see if we are in a lambda runtime
|
|
79
|
+
if (isOnAWSLambda()) {
|
|
80
|
+
info.message = JSON.stringify(info.message);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
info.message = JSON.stringify(info.message, undefined, 2);
|
|
84
|
+
}
|
|
75
85
|
}
|
|
76
86
|
let lead;
|
|
77
87
|
switch (info.level) {
|
|
@@ -79,18 +89,33 @@ function log() {
|
|
|
79
89
|
lead = chalk.blue("debug");
|
|
80
90
|
break;
|
|
81
91
|
case "info":
|
|
82
|
-
|
|
92
|
+
// space here is to help with readability
|
|
93
|
+
lead = chalk.green(" info");
|
|
83
94
|
break;
|
|
84
95
|
case "warn":
|
|
85
|
-
|
|
96
|
+
// space here is to help with readability
|
|
97
|
+
lead = chalk.yellow(" warn");
|
|
86
98
|
break;
|
|
87
99
|
case "error":
|
|
88
100
|
lead = chalk.red("error");
|
|
89
101
|
break;
|
|
90
102
|
default:
|
|
91
|
-
lead = "📣";
|
|
103
|
+
lead = " 📣";
|
|
104
|
+
}
|
|
105
|
+
if (isOnAWSLambda()) {
|
|
106
|
+
// CloudWatch automatically includes the timestamp, it isn't needed
|
|
107
|
+
return `${lead}|${info.message}`;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
// outside, just print the time mm
|
|
111
|
+
const time = new Date(info.timestamp).toLocaleTimeString([], {
|
|
112
|
+
minute: '2-digit',
|
|
113
|
+
hour: '2-digit',
|
|
114
|
+
second: '2-digit',
|
|
115
|
+
hour12: false
|
|
116
|
+
});
|
|
117
|
+
return `${lead}|${time}|${info.message}`;
|
|
92
118
|
}
|
|
93
|
-
return `${lead}:${info.message}`;
|
|
94
119
|
})),
|
|
95
120
|
transports: [
|
|
96
121
|
new winston_1.transports.Console({
|
package/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";AAAA,oCAAoC;;;AAEpC,iDAA6D;AAC7D,+BAAgC;AAEhC,qCAA2D;AAc3D,0BAA0B;AAC1B,IAAI,MAAc,CAAC;AAEnB;;GAEG;AACH,SAAgB,MAAM,CAAC,IAAuB;IAC1C,0BAA0B;IAC1B,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,EAAE;QACrC,OAAO,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAA;QAC7F,OAAO,IAAI,CAAC;KACf;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,EAAE;QACxC,OAAO,IAAI,CAAC;KACf;IACD,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC3B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC7B,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,KAAK,MAAM,CAAC;QAC/D,IAAI,OAAO,EAAE;YACT,OAAO,CAAC,IAAI,CAAC,yGAAyG,CAAC,CAAA;SAC1H;QACD,sDAAsD;QACtD,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;YAC1C,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,MAAM,CAAC;SACjE;QACD,OAAO,GAAG,IAAA,0BAAU,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO,GAAG,IAAA,gCAAgB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KAChD;SAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QACpC,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,QAAQ,GAAG,IAAA,0BAAU,EAAC,QAAQ,CAAC,CAAC;QAChC,QAAQ,GAAG,IAAA,gCAAgB,EAAC,QAAQ,CAAC,CAAC;QACtC,IAAI;YACA,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SAClC;QAAC,OAAO,CAAC,EAAE;YACR,iCAAiC;YACjC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,0BAA0B;YAC1B,MAAM,KAAK,GAAG,4CAA4C,CAAC;YAC3D,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,MAAM,EAAE;gBAC9C,OAAe,CAAC,WAAW,GAAG,yBAAyB,QAAQ,EAAE,CAAC;aACtE;iBAAM,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK,MAAM,EAAE;gBACnD,OAAO,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAC;gBAC/F,OAAe,CAAC,WAAW,GAAG,yBAAyB,QAAQ,EAAE,CAAC;aACtE;iBAAM;gBACH,OAAO,GAAG,KAAK,CAAC;aACnB;SACJ;KACJ;IACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACvB,OAAO,IAAI,CAAC;AAChB,CAAC;AA7CD,wBA6CC;AAED;;;;GAIG;AACH,SAAgB,GAAG;IACf,IAAI,CAAC,MAAM,EAAE;QACT,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC;QAErF,MAAM,GAAG,IAAA,sBAAY,EAAC;YAClB,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,IAAA,gBAAM,EAAC,MAAM,CAAC,EAAE,EAChB,gBAAM,CAAC,WAAW,EAAE,EACpB,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;
|
|
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.56.
|
|
7
|
+
"version": "1.56.14",
|
|
8
8
|
"description": "Simple logging library built on top of Winston for 📣 stentor",
|
|
9
9
|
"types": "lib/index",
|
|
10
10
|
"main": "lib/index",
|
|
@@ -23,13 +23,13 @@
|
|
|
23
23
|
"mocha": "9.2.2",
|
|
24
24
|
"sinon": "14.0.0",
|
|
25
25
|
"sinon-chai": "3.7.0",
|
|
26
|
-
"stentor-models": "1.56.
|
|
26
|
+
"stentor-models": "1.56.12",
|
|
27
27
|
"ts-node": "10.8.1",
|
|
28
28
|
"typescript": "4.7.4"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"chalk": "4.1.2",
|
|
32
|
-
"stentor-utils": "1.56.
|
|
32
|
+
"stentor-utils": "1.56.14",
|
|
33
33
|
"winston": "3.7.2"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"clean": "rm -rf ./lib/*",
|
|
38
38
|
"test": "mocha --recursive -r ts-node/register \"./src/**/*.test.ts\""
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "cfe63fdcbad9c41f1360a48d254095fc9a670f03"
|
|
41
41
|
}
|