@jayfong/x-server 2.40.2 → 2.41.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/_cjs/services/log.js +2 -3
- package/lib/services/log.d.ts +0 -1
- package/lib/services/log.js +2 -3
- package/package.json +1 -1
package/lib/_cjs/services/log.js
CHANGED
|
@@ -11,7 +11,6 @@ var _x = require("../x");
|
|
|
11
11
|
class LogService {
|
|
12
12
|
constructor() {
|
|
13
13
|
this.serviceName = 'log';
|
|
14
|
-
this.separator = '\t\t\t';
|
|
15
14
|
this.getLogWriter = (0, _vtils.memoize)(logFile => {
|
|
16
15
|
_fsExtra.default.ensureFileSync(logFile);
|
|
17
16
|
return _fsExtra.default.createWriteStream(logFile, {
|
|
@@ -28,7 +27,7 @@ class LogService {
|
|
|
28
27
|
return this.getLogFile(new Date());
|
|
29
28
|
}
|
|
30
29
|
parseLogLineText(text, keysMap = {}) {
|
|
31
|
-
const [time, level, title, ...desc] = text.split(
|
|
30
|
+
const [time, level, title, ...desc] = text.split(/\t+/);
|
|
32
31
|
return {
|
|
33
32
|
time: time,
|
|
34
33
|
level: level,
|
|
@@ -45,7 +44,7 @@ class LogService {
|
|
|
45
44
|
};
|
|
46
45
|
}
|
|
47
46
|
log(payload) {
|
|
48
|
-
this.getLogWriter(this.logFile).write(`${[(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].
|
|
47
|
+
this.getLogWriter(this.logFile).write(`${[(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].map(item => String(item).replace(/[\r\n\t]+/g, ' ')).join('\t')}\n`);
|
|
49
48
|
}
|
|
50
49
|
info(title, desc) {
|
|
51
50
|
this.log({
|
package/lib/services/log.d.ts
CHANGED
|
@@ -13,7 +13,6 @@ export type LogServiceLogItem<K extends string = string> = Merge<LogServicePaylo
|
|
|
13
13
|
}>;
|
|
14
14
|
export declare class LogService implements BaseService {
|
|
15
15
|
serviceName: string;
|
|
16
|
-
private separator;
|
|
17
16
|
getLogFile(date: Date): string;
|
|
18
17
|
private get logFile();
|
|
19
18
|
private getLogWriter;
|
package/lib/services/log.js
CHANGED
|
@@ -6,7 +6,6 @@ import { x } from "../x";
|
|
|
6
6
|
export class LogService {
|
|
7
7
|
constructor() {
|
|
8
8
|
this.serviceName = 'log';
|
|
9
|
-
this.separator = '\t\t\t';
|
|
10
9
|
this.getLogWriter = memoize(logFile => {
|
|
11
10
|
fs.ensureFileSync(logFile);
|
|
12
11
|
return fs.createWriteStream(logFile, {
|
|
@@ -23,7 +22,7 @@ export class LogService {
|
|
|
23
22
|
return this.getLogFile(new Date());
|
|
24
23
|
}
|
|
25
24
|
parseLogLineText(text, keysMap = {}) {
|
|
26
|
-
const [time, level, title, ...desc] = text.split(
|
|
25
|
+
const [time, level, title, ...desc] = text.split(/\t+/);
|
|
27
26
|
return {
|
|
28
27
|
time: time,
|
|
29
28
|
level: level,
|
|
@@ -40,7 +39,7 @@ export class LogService {
|
|
|
40
39
|
};
|
|
41
40
|
}
|
|
42
41
|
log(payload) {
|
|
43
|
-
this.getLogWriter(this.logFile).write(`${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].
|
|
42
|
+
this.getLogWriter(this.logFile).write(`${[formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss'), payload.level, payload.title, ...(!payload.desc ? [] : Array.isArray(payload.desc) ? payload.desc : Object.keys(payload.desc).map(key => `${key}:${payload.desc[key]}`))].map(item => String(item).replace(/[\r\n\t]+/g, ' ')).join('\t')}\n`);
|
|
44
43
|
}
|
|
45
44
|
info(title, desc) {
|
|
46
45
|
this.log({
|