import * as Bull from 'bull'
-import { JobState, JobType } from '../../../shared/models'
+import {
+ ActivitypubFollowPayload,
+ ActivitypubHttpBroadcastPayload,
+ ActivitypubHttpFetcherPayload,
+ ActivitypubHttpUnicastPayload,
+ EmailPayload,
+ JobState,
+ JobType,
+ RefreshPayload,
+ VideoFileImportPayload,
+ VideoImportPayload,
+ VideoRedundancyPayload,
+ VideoTranscodingPayload
+} from '../../../shared/models'
import { logger } from '../../helpers/logger'
import { Redis } from '../redis'
import { JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_TTL, REPEAT_JOBS, WEBSERVER } from '../../initializers/constants'
-import { ActivitypubHttpBroadcastPayload, processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast'
-import { ActivitypubHttpFetcherPayload, processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher'
-import { ActivitypubHttpUnicastPayload, processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast'
-import { EmailPayload, processEmail } from './handlers/email'
-import { processVideoTranscoding, VideoTranscodingPayload } from './handlers/video-transcoding'
-import { ActivitypubFollowPayload, processActivityPubFollow } from './handlers/activitypub-follow'
-import { processVideoImport, VideoImportPayload } from './handlers/video-import'
+import { processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast'
+import { processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher'
+import { processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast'
+import { processEmail } from './handlers/email'
+import { processVideoTranscoding } from './handlers/video-transcoding'
+import { processActivityPubFollow } from './handlers/activitypub-follow'
+import { processVideoImport } from './handlers/video-import'
import { processVideosViews } from './handlers/video-views'
-import { refreshAPObject, RefreshPayload } from './handlers/activitypub-refresher'
-import { processVideoFileImport, VideoFileImportPayload } from './handlers/video-file-import'
-import { processVideoRedundancy, VideoRedundancyPayload } from '@server/lib/job-queue/handlers/video-redundancy'
+import { refreshAPObject } from './handlers/activitypub-refresher'
+import { processVideoFileImport } from './handlers/video-file-import'
+import { processVideoRedundancy } from '@server/lib/job-queue/handlers/video-redundancy'
type CreateJobArgument =
{ type: 'activitypub-http-broadcast', payload: ActivitypubHttpBroadcastPayload } |
{ type: 'videos-views', payload: {} } |
{ type: 'video-redundancy', payload: VideoRedundancyPayload }
-const handlers: { [ id in JobType ]: (job: Bull.Job) => Promise<any>} = {
+const handlers: { [id in JobType]: (job: Bull.Job) => Promise<any> } = {
'activitypub-http-broadcast': processActivityPubHttpBroadcast,
'activitypub-http-unicast': processActivityPubHttpUnicast,
'activitypub-http-fetcher': processActivityPubHttpFetcher,
private static instance: JobQueue
- private queues: { [ id in JobType ]?: Bull.Queue } = {}
+ private queues: { [id in JobType]?: Bull.Queue } = {}
private initialized = false
private jobRedisPrefix: string
- private constructor () {}
+ private constructor () {
+ }
- async init () {
+ init () {
// Already initialized
if (this.initialized === true) return
this.initialized = true
}
}
- createJob (obj: CreateJobArgument) {
+ createJob (obj: CreateJobArgument): void {
+ this.createJobWithPromise(obj)
+ .catch(err => logger.error('Cannot create job.', { err, obj }))
+ }
+
+ createJobWithPromise (obj: CreateJobArgument) {
const queue = this.queues[obj.type]
if (queue === undefined) {
logger.error('Unknown queue %s: cannot create job.', obj.type)
- throw Error('Unknown queue, cannot create job')
+ return
}
const jobArgs: Bull.JobOptions = {
}
async listForApi (options: {
- state: JobState,
- start: number,
- count: number,
- asc?: boolean,
+ state: JobState
+ start: number
+ count: number
+ asc?: boolean
jobType: JobType
}): Promise<Bull.Job[]> {
const { state, start, count, asc, jobType } = options
const filteredJobTypes = this.filterJobTypes(jobType)
- // TODO: optimize
for (const jobType of filteredJobTypes) {
- const queue = this.queues[ jobType ]
+ const queue = this.queues[jobType]
if (queue === undefined) {
logger.error('Unknown queue %s to list jobs.', jobType)
continue
const filteredJobTypes = this.filterJobTypes(jobType)
for (const type of filteredJobTypes) {
- const queue = this.queues[ type ]
+ const queue = this.queues[type]
if (queue === undefined) {
logger.error('Unknown queue %s to count jobs.', type)
continue
const counts = await queue.getJobCounts()
- total += counts[ state ]
+ total += counts[state]
}
return total
private addRepeatableJobs () {
this.queues['videos-views'].add({}, {
repeat: REPEAT_JOBS['videos-views']
- })
+ }).catch(err => logger.error('Cannot add repeatable job.', { err }))
}
private filterJobTypes (jobType?: JobType) {