From 2b86fe727490fc0e42c0d147d98c0df612d5507c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Aug 2018 10:19:51 +0200 Subject: Add job ttl --- server/lib/job-queue/job-queue.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'server/lib/job-queue') diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts index ffd948b5f..8a24604e1 100644 --- a/server/lib/job-queue/job-queue.ts +++ b/server/lib/job-queue/job-queue.ts @@ -2,7 +2,7 @@ import * as Bull from 'bull' import { JobState, JobType } from '../../../shared/models' import { logger } from '../../helpers/logger' import { Redis } from '../redis' -import { CONFIG, JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_REQUEST_TTL } from '../../initializers' +import { CONFIG, JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_TTL } from '../../initializers' import { ActivitypubHttpBroadcastPayload, processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast' import { ActivitypubHttpFetcherPayload, processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher' import { ActivitypubHttpUnicastPayload, processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast' @@ -79,6 +79,7 @@ class JobQueue { const handler = handlers[handlerName] queue.process(JOB_CONCURRENCY[handlerName], handler) + .catch(err => logger.error('Error in job queue processor %s.', handlerName, { err })) queue.on('failed', (job, err) => { logger.error('Cannot execute job %d in queue %s.', job.id, handlerName, { payload: job.data, err }) @@ -109,11 +110,8 @@ class JobQueue { const jobArgs: Bull.JobOptions = { backoff: { delay: 60 * 1000, type: 'exponential' }, - attempts: JOB_ATTEMPTS[obj.type] - } - - if (jobsWithRequestTimeout[obj.type] === true) { - jobArgs.timeout = JOB_REQUEST_TTL + attempts: JOB_ATTEMPTS[obj.type], + timeout: JOB_TTL[obj.type] } return queue.add(obj.payload, jobArgs) -- cgit v1.2.3