diff options
Diffstat (limited to 'server/controllers/api/jobs.ts')
-rw-r--r-- | server/controllers/api/jobs.ts | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts index c61b7362f..6a53e3083 100644 --- a/server/controllers/api/jobs.ts +++ b/server/controllers/api/jobs.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { Job as BullJob } from 'bullmq' | ||
1 | import express from 'express' | 2 | import express from 'express' |
2 | import { HttpStatusCode, Job, JobState, JobType, ResultList, UserRight } from '@shared/models' | 3 | import { HttpStatusCode, Job, JobState, JobType, ResultList, UserRight } from '@shared/models' |
3 | import { isArray } from '../../helpers/custom-validators/misc' | 4 | import { isArray } from '../../helpers/custom-validators/misc' |
@@ -25,7 +26,7 @@ jobsRouter.post('/pause', | |||
25 | jobsRouter.post('/resume', | 26 | jobsRouter.post('/resume', |
26 | authenticate, | 27 | authenticate, |
27 | ensureUserHasRight(UserRight.MANAGE_JOBS), | 28 | ensureUserHasRight(UserRight.MANAGE_JOBS), |
28 | asyncMiddleware(resumeJobQueue) | 29 | resumeJobQueue |
29 | ) | 30 | ) |
30 | 31 | ||
31 | jobsRouter.get('/:state?', | 32 | jobsRouter.get('/:state?', |
@@ -54,8 +55,8 @@ async function pauseJobQueue (req: express.Request, res: express.Response) { | |||
54 | return res.sendStatus(HttpStatusCode.NO_CONTENT_204) | 55 | return res.sendStatus(HttpStatusCode.NO_CONTENT_204) |
55 | } | 56 | } |
56 | 57 | ||
57 | async function resumeJobQueue (req: express.Request, res: express.Response) { | 58 | function resumeJobQueue (req: express.Request, res: express.Response) { |
58 | await JobQueue.Instance.resume() | 59 | JobQueue.Instance.resume() |
59 | 60 | ||
60 | return res.sendStatus(HttpStatusCode.NO_CONTENT_204) | 61 | return res.sendStatus(HttpStatusCode.NO_CONTENT_204) |
61 | } | 62 | } |
@@ -82,7 +83,7 @@ async function listJobs (req: express.Request, res: express.Response) { | |||
82 | return res.json(result) | 83 | return res.json(result) |
83 | } | 84 | } |
84 | 85 | ||
85 | async function formatJob (job: any, state?: JobState): Promise<Job> { | 86 | async function formatJob (job: BullJob, state?: JobState): Promise<Job> { |
86 | const error = isArray(job.stacktrace) && job.stacktrace.length !== 0 | 87 | const error = isArray(job.stacktrace) && job.stacktrace.length !== 0 |
87 | ? job.stacktrace[0] | 88 | ? job.stacktrace[0] |
88 | : null | 89 | : null |
@@ -90,9 +91,9 @@ async function formatJob (job: any, state?: JobState): Promise<Job> { | |||
90 | return { | 91 | return { |
91 | id: job.id, | 92 | id: job.id, |
92 | state: state || await job.getState(), | 93 | state: state || await job.getState(), |
93 | type: job.queue.name as JobType, | 94 | type: job.queueName as JobType, |
94 | data: job.data, | 95 | data: job.data, |
95 | progress: await job.progress(), | 96 | progress: job.progress as number, |
96 | priority: job.opts.priority, | 97 | priority: job.opts.priority, |
97 | error, | 98 | error, |
98 | createdAt: new Date(job.timestamp), | 99 | createdAt: new Date(job.timestamp), |