diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2021-02-27 17:39:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-27 17:39:55 +0900 |
| commit | 4c01dcd8eb2bb9bed889c76cf4e192ea11914d61 (patch) | |
| tree | 3044231bee4f6d7c45e2d98371bf5a70805268b9 /src/services/logger.ts | |
| parent | Update y18n in yarn.lock (#7246) (diff) | |
| download | sharkey-4c01dcd8eb2bb9bed889c76cf4e192ea11914d61.tar.gz sharkey-4c01dcd8eb2bb9bed889c76cf4e192ea11914d61.tar.bz2 sharkey-4c01dcd8eb2bb9bed889c76cf4e192ea11914d61.zip | |
Fix #7248 (#7250)
* Fix #7248
* fix
* fix
* fix
* avoid infinite loop
Diffstat (limited to 'src/services/logger.ts')
| -rw-r--r-- | src/services/logger.ts | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/services/logger.ts b/src/services/logger.ts index eb2b257dde..c7483d3faa 100644 --- a/src/services/logger.ts +++ b/src/services/logger.ts @@ -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); } } |