From 05a16948a3ffebc0c129d7a52af2222edeebe886 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Thu, 20 May 2021 11:42:27 +0100 Subject: [PATCH] Moved testmode routes into a correctly named file - testmode routing was in an index.js file, this breaks our coding standards - these routes belong in routes file, same as all other routes --- core/server/web/api/testmode/index.js | 82 +------------------------- core/server/web/api/testmode/routes.js | 81 +++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 81 deletions(-) create mode 100644 core/server/web/api/testmode/routes.js diff --git a/core/server/web/api/testmode/index.js b/core/server/web/api/testmode/index.js index 0c94b40dd6..3b3a4503eb 100644 --- a/core/server/web/api/testmode/index.js +++ b/core/server/web/api/testmode/index.js @@ -1,81 +1 @@ -const path = require('path'); -const logging = require('../../../../shared/logging'); -const express = require('../../../../shared/express'); -const jobsService = require('../../../services/jobs'); - -/** A bunch of helper routes for testing purposes */ -module.exports = function testRoutes() { - const router = express.Router('canary admin'); - - router.get('/500', (req, res) => res.sendStatus(500)); - router.get('/400', (req, res) => res.sendStatus(400)); - router.get('/404', (req, res) => res.sendStatus(404)); - router.get('/slow/:timeout', (req, res) => { - if (!req.params || !req.params.timeout) { - return res.sendStatus(200); - } - const timeout = req.params.timeout * 1000; - logging.info('Begin Slow Request with timeout of', timeout); - setTimeout(() => { - logging.info('End Slow Request', timeout); - res.sendStatus(200); - }, timeout); - }); - router.get('/job/:timeout', (req, res) => { - if (!req.params || !req.params.timeout) { - return res.sendStatus(200); - } - - const timeout = req.params.timeout * 1000; - logging.info('Create Slow Job with timeout of', timeout); - jobsService.addJob({ - job: () => { - return new Promise((resolve) => { - logging.info('Start Slow Job'); - setTimeout(() => { - logging.info('End Slow Job', timeout); - resolve(); - }, timeout); - }); - }, - offloaded: false - }); - - res.sendStatus(202); - }); - - router.get('/schedule/:schedule/:name*?', (req, res) => { - if (!req.params.schedule) { - return res.sendStatus(400, 'schedule parameter cannot be mepty'); - } - - const schedule = req.params.schedule; - const jobName = req.params.name || `generic-${new Date().getTime()}`; - logging.info('Achedule a Job with schedule of:', schedule, req.params.name); - - if (req.params.name) { - const jobPath = path.resolve(__dirname, 'jobs', `${req.params.name}.js`); - jobsService.addJob({ - at: schedule, - job: jobPath, - name: jobName - }); - } else { - jobsService.addJob({ - at: schedule, - job: () => { - return new Promise((resolve) => { - setTimeout(() => { - resolve(); - }, 20 * 1000); - }); - }, - name: jobName - }); - } - - res.sendStatus(202); - }); - - return router; -}; +module.exports = require('./routes'); diff --git a/core/server/web/api/testmode/routes.js b/core/server/web/api/testmode/routes.js new file mode 100644 index 0000000000..0c94b40dd6 --- /dev/null +++ b/core/server/web/api/testmode/routes.js @@ -0,0 +1,81 @@ +const path = require('path'); +const logging = require('../../../../shared/logging'); +const express = require('../../../../shared/express'); +const jobsService = require('../../../services/jobs'); + +/** A bunch of helper routes for testing purposes */ +module.exports = function testRoutes() { + const router = express.Router('canary admin'); + + router.get('/500', (req, res) => res.sendStatus(500)); + router.get('/400', (req, res) => res.sendStatus(400)); + router.get('/404', (req, res) => res.sendStatus(404)); + router.get('/slow/:timeout', (req, res) => { + if (!req.params || !req.params.timeout) { + return res.sendStatus(200); + } + const timeout = req.params.timeout * 1000; + logging.info('Begin Slow Request with timeout of', timeout); + setTimeout(() => { + logging.info('End Slow Request', timeout); + res.sendStatus(200); + }, timeout); + }); + router.get('/job/:timeout', (req, res) => { + if (!req.params || !req.params.timeout) { + return res.sendStatus(200); + } + + const timeout = req.params.timeout * 1000; + logging.info('Create Slow Job with timeout of', timeout); + jobsService.addJob({ + job: () => { + return new Promise((resolve) => { + logging.info('Start Slow Job'); + setTimeout(() => { + logging.info('End Slow Job', timeout); + resolve(); + }, timeout); + }); + }, + offloaded: false + }); + + res.sendStatus(202); + }); + + router.get('/schedule/:schedule/:name*?', (req, res) => { + if (!req.params.schedule) { + return res.sendStatus(400, 'schedule parameter cannot be mepty'); + } + + const schedule = req.params.schedule; + const jobName = req.params.name || `generic-${new Date().getTime()}`; + logging.info('Achedule a Job with schedule of:', schedule, req.params.name); + + if (req.params.name) { + const jobPath = path.resolve(__dirname, 'jobs', `${req.params.name}.js`); + jobsService.addJob({ + at: schedule, + job: jobPath, + name: jobName + }); + } else { + jobsService.addJob({ + at: schedule, + job: () => { + return new Promise((resolve) => { + setTimeout(() => { + resolve(); + }, 20 * 1000); + }); + }, + name: jobName + }); + } + + res.sendStatus(202); + }); + + return router; +};