@subsquid/logger 0.0.2 → 0.1.0
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/sinks/json.js +15 -1
- package/lib/sinks/json.js.map +1 -1
- package/lib/sinks/pretty.d.ts.map +1 -1
- package/lib/sinks/pretty.js +17 -3
- package/lib/sinks/pretty.js.map +1 -1
- package/package.json +1 -1
- package/src/sinks/json.ts +15 -1
- package/src/sinks/pretty.ts +15 -3
package/lib/sinks/json.js
CHANGED
|
@@ -9,7 +9,12 @@ function jsonLinesStderrSink(rec) {
|
|
|
9
9
|
exports.jsonLinesStderrSink = jsonLinesStderrSink;
|
|
10
10
|
function stringify(rec) {
|
|
11
11
|
try {
|
|
12
|
-
|
|
12
|
+
let json = (0, util_internal_json_1.toJSON)(rec);
|
|
13
|
+
let label = LABELS?.[json.level];
|
|
14
|
+
if (label) {
|
|
15
|
+
json.level = label;
|
|
16
|
+
}
|
|
17
|
+
return JSON.stringify(json);
|
|
13
18
|
}
|
|
14
19
|
catch (e) {
|
|
15
20
|
return stringify({
|
|
@@ -21,4 +26,13 @@ function stringify(rec) {
|
|
|
21
26
|
});
|
|
22
27
|
}
|
|
23
28
|
}
|
|
29
|
+
const LABELS = (() => {
|
|
30
|
+
let json = process.env.SQD_LOG_LABELS;
|
|
31
|
+
if (!json)
|
|
32
|
+
return undefined;
|
|
33
|
+
try {
|
|
34
|
+
return JSON.parse(json);
|
|
35
|
+
}
|
|
36
|
+
catch (e) { }
|
|
37
|
+
})();
|
|
24
38
|
//# sourceMappingURL=json.js.map
|
package/lib/sinks/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/sinks/json.ts"],"names":[],"mappings":";;;AAAA,qEAAmD;AACnD,oCAAiC;AAIjC,SAAgB,mBAAmB,CAAC,GAAc;IAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;AAC/C,CAAC;AAFD,kDAEC;AAGD,SAAS,SAAS,CAAC,GAAc;IAC7B,IAAI;QACA,
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/sinks/json.ts"],"names":[],"mappings":";;;AAAA,qEAAmD;AACnD,oCAAiC;AAIjC,SAAgB,mBAAmB,CAAC,GAAc;IAC9C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;AAC/C,CAAC;AAFD,kDAEC;AAGD,SAAS,SAAS,CAAC,GAAc;IAC7B,IAAI;QACA,IAAI,IAAI,GAAG,IAAA,2BAAM,EAAC,GAAG,CAAC,CAAA;QACtB,IAAI,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;SACrB;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;KAC9B;IAAC,OAAM,CAAM,EAAE;QACZ,OAAO,SAAS,CAAC;YACb,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,KAAK,EAAE,gBAAQ,CAAC,KAAK;YACrB,GAAG,EAAE,uCAAuC,GAAG,CAAC,EAAE,EAAE;YACpD,GAAG,EAAE,EAAC,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAU;SACjD,CAAC,CAAA;KACL;AACL,CAAC;AAGD,MAAM,MAAM,GAAuC,CAAC,GAAG,EAAE;IACrD,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;IACrC,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IAC3B,IAAI;QACA,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;KAC1B;IAAC,OAAM,CAAM,EAAE,GAAE;AACtB,CAAC,CAAC,EAAE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pretty.d.ts","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AAGnC,qBAAa,OAAO;IAMJ,OAAO,CAAC,GAAG;IAA0B,OAAO,CAAC,QAAQ;IALjE,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAC,CAA+B;IAC7C,OAAO,CAAC,aAAa,CAAQ;gBAET,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAU,QAAQ,EAAE,OAAO;IAE1E,OAAO,CAAC,IAAI;IAWZ,OAAO,CAAC,IAAI;IAMZ,OAAO,CAAC,KAAK;IAQb,OAAO,CAAC,GAAG;IAKX,OAAO,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"pretty.d.ts","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AAGnC,qBAAa,OAAO;IAMJ,OAAO,CAAC,GAAG;IAA0B,OAAO,CAAC,QAAQ;IALjE,OAAO,CAAC,MAAM,CAAC,CAAQ;IACvB,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,KAAK,CAAC,CAA+B;IAC7C,OAAO,CAAC,aAAa,CAAQ;gBAET,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAU,QAAQ,EAAE,OAAO;IAE1E,OAAO,CAAC,IAAI;IAWZ,OAAO,CAAC,IAAI;IAMZ,OAAO,CAAC,KAAK;IAQb,OAAO,CAAC,GAAG;IAKX,OAAO,CAAC,QAAQ;IAyEhB,KAAK,CAAC,GAAG,EAAE,SAAS;IAuCpB,KAAK,IAAI,IAAI;CAMhB;AAkFD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAcrD"}
|
package/lib/sinks/pretty.js
CHANGED
|
@@ -95,8 +95,15 @@ class Printer {
|
|
|
95
95
|
else {
|
|
96
96
|
this.visited.add(val);
|
|
97
97
|
}
|
|
98
|
+
let props;
|
|
99
|
+
if (val instanceof Error) {
|
|
100
|
+
props = { ...val, stack: val.stack || val.toString() };
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
props = val;
|
|
104
|
+
}
|
|
98
105
|
let has = false;
|
|
99
|
-
for (let key in
|
|
106
|
+
for (let key in props) {
|
|
100
107
|
if (!has) {
|
|
101
108
|
if (prefix == ' -') {
|
|
102
109
|
this.begin(prefix);
|
|
@@ -107,7 +114,7 @@ class Printer {
|
|
|
107
114
|
}
|
|
108
115
|
}
|
|
109
116
|
has = true;
|
|
110
|
-
this.property(key + ':',
|
|
117
|
+
this.property(key + ':', props[key]);
|
|
111
118
|
}
|
|
112
119
|
if (has) {
|
|
113
120
|
this.end();
|
|
@@ -134,7 +141,14 @@ class Printer {
|
|
|
134
141
|
case 'msg':
|
|
135
142
|
break;
|
|
136
143
|
default:
|
|
137
|
-
|
|
144
|
+
if (key == 'err' && rec.err instanceof Error) {
|
|
145
|
+
// already printed the stack trace above
|
|
146
|
+
// print only the rest of props
|
|
147
|
+
this.property('err:', { ...rec.err });
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
this.property(key + ':', rec[key]);
|
|
151
|
+
}
|
|
138
152
|
}
|
|
139
153
|
}
|
|
140
154
|
this.end();
|
package/lib/sinks/pretty.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pretty.js","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pretty.js","sourceRoot":"","sources":["../../src/sinks/pretty.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/sinks/json.ts
CHANGED
|
@@ -10,7 +10,12 @@ export function jsonLinesStderrSink(rec: LogRecord): void {
|
|
|
10
10
|
|
|
11
11
|
function stringify(rec: LogRecord): string {
|
|
12
12
|
try {
|
|
13
|
-
|
|
13
|
+
let json = toJSON(rec)
|
|
14
|
+
let label = LABELS?.[json.level]
|
|
15
|
+
if (label) {
|
|
16
|
+
json.level = label
|
|
17
|
+
}
|
|
18
|
+
return JSON.stringify(json)
|
|
14
19
|
} catch(e: any) {
|
|
15
20
|
return stringify({
|
|
16
21
|
ns: 'sys',
|
|
@@ -21,3 +26,12 @@ function stringify(rec: LogRecord): string {
|
|
|
21
26
|
})
|
|
22
27
|
}
|
|
23
28
|
}
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
const LABELS: Record<number, string> | undefined = (() => {
|
|
32
|
+
let json = process.env.SQD_LOG_LABELS
|
|
33
|
+
if (!json) return undefined
|
|
34
|
+
try {
|
|
35
|
+
return JSON.parse(json)
|
|
36
|
+
} catch(e: any) {}
|
|
37
|
+
})()
|
package/src/sinks/pretty.ts
CHANGED
|
@@ -88,8 +88,14 @@ export class Printer {
|
|
|
88
88
|
} else {
|
|
89
89
|
this.visited.add(val)
|
|
90
90
|
}
|
|
91
|
+
let props: any
|
|
92
|
+
if (val instanceof Error) {
|
|
93
|
+
props = {...val, stack: val.stack || val.toString()}
|
|
94
|
+
} else {
|
|
95
|
+
props = val
|
|
96
|
+
}
|
|
91
97
|
let has = false
|
|
92
|
-
for (let key in
|
|
98
|
+
for (let key in props) {
|
|
93
99
|
if (!has) {
|
|
94
100
|
if (prefix == ' -') {
|
|
95
101
|
this.begin(prefix)
|
|
@@ -99,7 +105,7 @@ export class Printer {
|
|
|
99
105
|
}
|
|
100
106
|
}
|
|
101
107
|
has = true
|
|
102
|
-
this.property(key + ':',
|
|
108
|
+
this.property(key + ':', props[key])
|
|
103
109
|
}
|
|
104
110
|
if (has) {
|
|
105
111
|
this.end()
|
|
@@ -127,7 +133,13 @@ export class Printer {
|
|
|
127
133
|
case 'msg':
|
|
128
134
|
break
|
|
129
135
|
default:
|
|
130
|
-
|
|
136
|
+
if (key == 'err' && rec.err instanceof Error) {
|
|
137
|
+
// already printed the stack trace above
|
|
138
|
+
// print only the rest of props
|
|
139
|
+
this.property('err:', {...rec.err})
|
|
140
|
+
} else {
|
|
141
|
+
this.property(key + ':', (rec as any)[key])
|
|
142
|
+
}
|
|
131
143
|
}
|
|
132
144
|
}
|
|
133
145
|
this.end()
|