From 94831479f5facff9469540a3d49dd347b88bdf5a Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 10 Jul 2018 17:02:20 +0200
Subject: Migrate to bull
---
server/controllers/api/jobs.ts | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
(limited to 'server/controllers')
diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts
index aa58a9144..c19596dde 100644
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -13,6 +13,7 @@ import {
} from '../../middlewares'
import { paginationValidator } from '../../middlewares/validators'
import { listJobsValidator } from '../../middlewares/validators/jobs'
+import { isArray } from '../../helpers/custom-validators/misc'
const jobsRouter = express.Router()
@@ -36,26 +37,30 @@ export {
// ---------------------------------------------------------------------------
async function listJobs (req: express.Request, res: express.Response, next: express.NextFunction) {
- const sort = req.query.sort === 'createdAt' ? 'ASC' : 'DESC'
+ const state: JobState = req.params.state
+ const asc = req.query.sort === 'createdAt'
- const jobs = await JobQueue.Instance.listForApi(req.params.state, req.query.start, req.query.count, sort)
- const total = await JobQueue.Instance.count(req.params.state)
+ const jobs = await JobQueue.Instance.listForApi(state, req.query.start, req.query.count, asc)
+ const total = await JobQueue.Instance.count(state)
const result: ResultList<any> = {
total,
- data: jobs.map(j => formatJob(j.toJSON()))
+ data: jobs.map(j => formatJob(j, state))
}
return res.json(result)
}
-function formatJob (job: any): Job {
+function formatJob (job: any, state: JobState): Job {
+ const error = isArray(job.stacktrace) && job.stacktrace.length !== 0 ? job.stacktrace[0] : null
+
return {
id: job.id,
- state: job.state as JobState,
- type: job.type as JobType,
+ state: state,
+ type: job.queue.name as JobType,
data: job.data,
- error: job.error,
- createdAt: new Date(parseInt(job.created_at, 10)),
- updatedAt: new Date(parseInt(job.updated_at, 10))
+ error,
+ createdAt: new Date(job.timestamp),
+ finishedOn: new Date(job.finishedOn),
+ processedOn: new Date(job.processedOn)
}
}
--
cgit v1.2.3