Fix incorrect error logs

[github/Chocobozzz/PeerTube.git] / server / controllers / api / jobs.ts

diff --git a/server/controllers/api/jobs.ts b/server/controllers/api/jobs.ts
index 1131a44d605800da9cc41b571bfb4f6fa19b8f56..c61b7362f22a8277bbf5cd49161c5056d836f9ec 100644 (file)
--- a/server/controllers/api/jobs.ts
+++ b/server/controllers/api/jobs.ts
@@ -1,43 +1,42 @@
-import * as express from 'express'
-import { ResultList } from '../../../shared'
-import { Job, JobType, JobState } from '../../../shared/models'
-import { UserRight } from '../../../shared/models/users'
+import express from 'express'
+import { HttpStatusCode, Job, JobState, JobType, ResultList, UserRight } from '@shared/models'
+import { isArray } from '../../helpers/custom-validators/misc'
 import { JobQueue } from '../../lib/job-queue'
 import {
   asyncMiddleware,
   authenticate,
   ensureUserHasRight,
   jobsSortValidator,
+  openapiOperationDoc,
+  paginationValidatorBuilder,
   setDefaultPagination,
   setDefaultSort
 } from '../../middlewares'
-import { paginationValidator } from '../../middlewares/validators'
-import { listJobsStateValidator, listJobsValidator } from '../../middlewares/validators/jobs'
-import { isArray } from '../../helpers/custom-validators/misc'
-import { jobStates } from '@server/helpers/custom-validators/jobs'
+import { listJobsValidator } from '../../middlewares/validators/jobs'
 
 const jobsRouter = express.Router()
 
-jobsRouter.get('/',
+jobsRouter.post('/pause',
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_JOBS),
-  paginationValidator,
-  jobsSortValidator,
-  setDefaultSort,
-  setDefaultPagination,
-  listJobsValidator,
-  asyncMiddleware(listJobs)
+  asyncMiddleware(pauseJobQueue)
+)
+
+jobsRouter.post('/resume',
+  authenticate,
+  ensureUserHasRight(UserRight.MANAGE_JOBS),
+  asyncMiddleware(resumeJobQueue)
 )
 
-jobsRouter.get('/:state',
+jobsRouter.get('/:state?',
+  openapiOperationDoc({ operationId: 'getJobs' }),
   authenticate,
   ensureUserHasRight(UserRight.MANAGE_JOBS),
-  paginationValidator,
+  paginationValidatorBuilder([ 'jobs' ]),
   jobsSortValidator,
   setDefaultSort,
   setDefaultPagination,
   listJobsValidator,
-  listJobsStateValidator,
   asyncMiddleware(listJobs)
 )
 
@@ -49,8 +48,20 @@ export {
 
 // ---------------------------------------------------------------------------
 
+async function pauseJobQueue (req: express.Request, res: express.Response) {
+  await JobQueue.Instance.pause()
+
+  return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
+}
+
+async function resumeJobQueue (req: express.Request, res: express.Response) {
+  await JobQueue.Instance.resume()
+
+  return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
+}
+
 async function listJobs (req: express.Request, res: express.Response) {
-  const state = req.params.state as JobState || jobStates
+  const state = req.params.state as JobState
   const asc = req.query.sort === 'createdAt'
   const jobType = req.query.jobType
 
@@ -65,23 +76,24 @@ async function listJobs (req: express.Request, res: express.Response) {
 
   const result: ResultList<Job> = {
     total,
-    data: Array.isArray(state)
-      ? await Promise.all(
-        jobs.map(async j => formatJob(j, await j.getState() as JobState))
-      )
-      : jobs.map(j => formatJob(j, state))
+    data: await Promise.all(jobs.map(j => formatJob(j, state)))
   }
+
   return res.json(result)
 }
 
-function formatJob (job: any, state: JobState): Job {
-  const error = isArray(job.stacktrace) && job.stacktrace.length !== 0 ? job.stacktrace[0] : null
+async function formatJob (job: any, state?: JobState): Promise<Job> {
+  const error = isArray(job.stacktrace) && job.stacktrace.length !== 0
+    ? job.stacktrace[0]
+    : null
 
   return {
     id: job.id,
-    state: state,
+    state: state || await job.getState(),
     type: job.queue.name as JobType,
     data: job.data,
+    progress: await job.progress(),
+    priority: job.opts.priority,
     error,
     createdAt: new Date(job.timestamp),
     finishedOn: new Date(job.finishedOn),