graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-24 04:03:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix #7248 (#7250)

Browse source 
* Fix #7248

* fix

* fix

* fix

* avoid infinite loop
This commit is contained in:
MeiMei 2021-02-27 17:39:55 +09:00 committed by GitHub
parent 95939e4991
commit 4c01dcd8eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/boot/index.ts
View file

@ -66,7 +66,9 @@ if (!program.quiet) {
// Display detail of uncaught exception
process.on('uncaughtException', err => {
logger.error(err);
try {
logger.error(err);
} catch { }
});
// Dying away...

8
src/services/logger.ts
View file

@ -94,7 +94,7 @@ export default class Logger {
level === 'info' ? this.syslogClient.info :
null as never;
send.bind(this.syslogClient)(message);
send.bind(this.syslogClient)(message).catch(() => {});
} else {
const Logs = getRepository(Log);
Logs.insert({
@ -106,7 +106,7 @@ export default class Logger {
level: level,
message: message.substr(0, 1000), // 1024を超えるとログが挿入できずエラーになり無限ループする
data: data,
} as Log);
} as Log).catch(() => {});
}
}
}
@ -116,8 +116,10 @@ export default class Logger {
data = data || {};
data.e = x;
this.log('error', x.toString(), data, important);
} else if (typeof x === 'object') {
this.log('error', `${(x as any).message || (x as any).name || x}`, data, important);
} else {
this.log('error', x, data, important);
this.log('error', `${x}`, data, important);
}
}