yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Add job ttl

Browse source
This commit is contained in:
Chocobozzz 2018-08-03 10:19:51 +02:00
parent 516df59b3b
commit 2b86fe7274
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/lib/job-queue/job-queue.ts
View file

@ -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)