Correctly close RTMPS server too

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / jobs.ts

diff --git a/server/middlewares/validators/jobs.ts b/server/middlewares/validators/jobs.ts
index 0fc183c1af9267b4c05d9c7ea6a40c11c65b572e..4de90548b067e9ab3378fb4dd26260e88e326599 100644 (file)
--- a/server/middlewares/validators/jobs.ts
+++ b/server/middlewares/validators/jobs.ts
@@ -1,29 +1,22 @@
-import * as express from 'express'
+import express from 'express'
 import { param, query } from 'express-validator'
 import { isValidJobState, isValidJobType } from '../../helpers/custom-validators/jobs'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
+import { logger, loggerTagsFactory } from '../../helpers/logger'
+import { areValidationErrors } from './shared'
+
+const lTags = loggerTagsFactory('validators', 'jobs')
 
 const listJobsValidator = [
+  param('state')
+  .optional()
+  .custom(isValidJobState).not().isEmpty().withMessage('Should have a valid job state'),
+
   query('jobType')
     .optional()
     .custom(isValidJobType).withMessage('Should have a valid job state'),
 
   (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking listJobsValidator parameters.', { parameters: req.params })
-
-    if (areValidationErrors(req, res)) return
-
-    return next()
-  }
-]
-
-const listJobsStateValidator = [
-  param('state')
-    .custom(isValidJobState).not().isEmpty().withMessage('Should have a valid job state'),
-
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking listJobsValidator parameters.', { parameters: req.params })
+    logger.debug('Checking listJobsValidator parameters.', { parameters: req.params, ...lTags() })
 
     if (areValidationErrors(req, res)) return
 
@@ -34,6 +27,5 @@ const listJobsStateValidator = [
 // ---------------------------------------------------------------------------
 
 export {
-  listJobsValidator,
-  listJobsStateValidator
+  listJobsValidator
 }