diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-11-07 00:02:18 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-11-07 00:02:18 +0900 |
| commit | 873444c3c6f7e3b9ecb6cce569d8cdb3fa032012 (patch) | |
| tree | 30a52b7ac3025e92c0e9ce5c7028a96af83f7088 /src/queue/index.ts | |
| parent | Resolve #5582 (#5583) (diff) | |
| download | sharkey-873444c3c6f7e3b9ecb6cce569d8cdb3fa032012.tar.gz sharkey-873444c3c6f7e3b9ecb6cce569d8cdb3fa032012.tar.bz2 sharkey-873444c3c6f7e3b9ecb6cce569d8cdb3fa032012.zip | |
APの統計とログの修正と強化 (#5585)
* Fix #5580
* Improve AP logging
Diffstat (limited to 'src/queue/index.ts')
| -rw-r--r-- | src/queue/index.ts | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/queue/index.ts b/src/queue/index.ts index 0b20017291..2d3cf6ee39 100644 --- a/src/queue/index.ts +++ b/src/queue/index.ts @@ -11,6 +11,7 @@ import processDb from './processors/db'; import procesObjectStorage from './processors/object-storage'; import { queueLogger } from './logger'; import { DriveFile } from '../models/entities/drive-file'; +import { getJobInfo } from './get-job-info'; function initializeQueue(name: string) { return new Queue(name, { @@ -44,19 +45,19 @@ const objectStorageLogger = queueLogger.createSubLogger('objectStorage'); deliverQueue .on('waiting', (jobId) => deliverLogger.debug(`waiting id=${jobId}`)) - .on('active', (job) => deliverLogger.debug(`active id=${job.id} to=${job.data.to}`)) - .on('completed', (job, result) => deliverLogger.debug(`completed(${result}) id=${job.id} to=${job.data.to}`)) - .on('failed', (job, err) => deliverLogger.warn(`failed(${err}) id=${job.id} to=${job.data.to}`, { job, e: renderError(err) })) + .on('active', (job) => deliverLogger.debug(`active ${getJobInfo(job, true)} to=${job.data.to}`)) + .on('completed', (job, result) => deliverLogger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`)) + .on('failed', (job, err) => deliverLogger.warn(`failed(${err}) ${getJobInfo(job)} to=${job.data.to}`)) .on('error', (job: any, err: Error) => deliverLogger.error(`error ${err}`, { job, e: renderError(err) })) - .on('stalled', (job) => deliverLogger.warn(`stalled id=${job.id} to=${job.data.to}`)); + .on('stalled', (job) => deliverLogger.warn(`stalled ${getJobInfo(job)} to=${job.data.to}`)); inboxQueue .on('waiting', (jobId) => inboxLogger.debug(`waiting id=${jobId}`)) - .on('active', (job) => inboxLogger.debug(`active id=${job.id}`)) - .on('completed', (job, result) => inboxLogger.debug(`completed(${result}) id=${job.id}`)) - .on('failed', (job, err) => inboxLogger.warn(`failed(${err}) id=${job.id} activity=${job.data.activity ? job.data.activity.id : 'none'}`, { job, e: renderError(err) })) + .on('active', (job) => inboxLogger.debug(`active ${getJobInfo(job, true)}`)) + .on('completed', (job, result) => inboxLogger.debug(`completed(${result}) ${getJobInfo(job, true)}`)) + .on('failed', (job, err) => inboxLogger.warn(`failed(${err}) ${getJobInfo(job)} activity=${job.data.activity ? job.data.activity.id : 'none'}`, { job, e: renderError(err) })) .on('error', (job: any, err: Error) => inboxLogger.error(`error ${err}`, { job, e: renderError(err) })) - .on('stalled', (job) => inboxLogger.warn(`stalled id=${job.id} activity=${job.data.activity ? job.data.activity.id : 'none'}`)); + .on('stalled', (job) => inboxLogger.warn(`stalled ${getJobInfo(job)} activity=${job.data.activity ? job.data.activity.id : 'none'}`)); dbQueue .on('waiting', (jobId) => dbLogger.debug(`waiting id=${jobId}`)) |