Requests -> RequestSchedulers

8 files changed, 21 insertions, 21 deletions

diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index ac3972ac6..3abe9bcf8 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -6,7 +6,7 @@ import { clientsRouter } from './clients'
 import { configRouter } from './config'
 import { podsRouter } from './pods'
 import { remoteRouter } from './remote'
-import { requestsRouter } from './requests'
+import { requestSchedulerRouter } from './request-schedulers'
 import { usersRouter } from './users'
 import { videosRouter } from './videos'
 
@@ -16,7 +16,7 @@ apiRouter.use('/clients', clientsRouter)
 apiRouter.use('/config', configRouter)
 apiRouter.use('/pods', podsRouter)
 apiRouter.use('/remote', remoteRouter)
-apiRouter.use('/requests', requestsRouter)
+apiRouter.use('/request-schedulers', requestSchedulerRouter)
 apiRouter.use('/users', usersRouter)
 apiRouter.use('/videos', videosRouter)
 apiRouter.use('/ping', pong)
diff --git a/server/controllers/api/requests.ts b/server/controllers/api/request-schedulers.ts
index 5718b59b7..8dd849007 100644
--- a/server/controllers/api/requests.ts
+++ b/server/controllers/api/request-schedulers.ts
@@ -8,29 +8,29 @@ import {
   getRequestVideoEventScheduler
 } from '../../lib'
 import { authenticate, ensureIsAdmin } from '../../middlewares'
-import { RequestSchedulerAttributes } from '../../../shared'
+import { RequestSchedulerStatsAttributes } from '../../../shared'
 
-const requestsRouter = express.Router()
+const requestSchedulerRouter = express.Router()
 
-requestsRouter.get('/stats',
+requestSchedulerRouter.get('/stats',
   authenticate,
   ensureIsAdmin,
-  getStatsRequests
+  getRequestSchedulersStats
 )
 
 // ---------------------------------------------------------------------------
 
 export {
-  requestsRouter
+  requestSchedulerRouter
 }
 
 // ---------------------------------------------------------------------------
 
-function getStatsRequests (req: express.Request, res: express.Response, next: express.NextFunction) {
+function getRequestSchedulersStats (req: express.Request, res: express.Response, next: express.NextFunction) {
   parallel({
-    requestScheduler: buildRequestSchedulerFunction(getRequestScheduler()),
-    requestVideoQaduScheduler: buildRequestSchedulerFunction(getRequestVideoQaduScheduler()),
-    requestVideoEventScheduler: buildRequestSchedulerFunction(getRequestVideoEventScheduler())
+    requestScheduler: buildRequestSchedulerStats(getRequestScheduler()),
+    requestVideoQaduScheduler: buildRequestSchedulerStats(getRequestVideoQaduScheduler()),
+    requestVideoEventScheduler: buildRequestSchedulerStats(getRequestVideoEventScheduler())
   }, function (err, result) {
     if (err) return next(err)
 
@@ -40,12 +40,12 @@ function getStatsRequests (req: express.Request, res: express.Response, next: ex
 
 // ---------------------------------------------------------------------------
 
-function buildRequestSchedulerFunction (requestScheduler: AbstractRequestScheduler) {
+function buildRequestSchedulerStats (requestScheduler: AbstractRequestScheduler) {
   return function (callback) {
     requestScheduler.remainingRequestsCount(function (err, count) {
       if (err) return callback(err)
 
-      const result: RequestSchedulerAttributes = {
+      const result: RequestSchedulerStatsAttributes = {
         totalRequests: count,
         requestsLimitPods: requestScheduler.limitPods,
         requestsLimitPerPod: requestScheduler.limitPerPod,
diff --git a/server/tests/api/check-params/index.js b/server/tests/api/check-params/index.js
index 527ab65a9..1ba16ff32 100644
--- a/server/tests/api/check-params/index.js
+++ b/server/tests/api/check-params/index.js
@@ -4,7 +4,7 @@
 require('./pods')
 require('./remotes')
 require('./users')
-require('./requests')
+require('./request-schedulers')
 require('./videos')
 require('./video-abuses')
 require('./video-blacklists')
diff --git a/server/tests/api/check-params/requests.js b/server/tests/api/check-params/request-schedulers.js
index 0ce5582d6..9ba0df730 100644
--- a/server/tests/api/check-params/requests.js
+++ b/server/tests/api/check-params/request-schedulers.js
@@ -9,8 +9,8 @@ const loginUtils = require('../../utils/login')
 const usersUtils = require('../../utils/users')
 const serversUtils = require('../../utils/servers')
 
-describe('Test requests API validators', function () {
-  const path = '/api/v1/requests/stats'
+describe('Test request schedulers stats API validators', function () {
+  const path = '/api/v1/request-schedulers/stats'
   let server = null
   let userAccessToken = null
 
diff --git a/server/tests/api/index.js b/server/tests/api/index.js
index cc86a3d3b..7404d7d88 100644
--- a/server/tests/api/index.js
+++ b/server/tests/api/index.js
@@ -9,6 +9,6 @@ require('./single-pod')
 require('./video-abuse')
 require('./video-blacklist')
 require('./multiple-pods')
-require('./requests')
+require('./request-schedulers')
 require('./friends-advanced')
 require('./video-transcoder')
diff --git a/server/tests/api/requests.js b/server/tests/api/request-schedulers.js
index 8762163af..c5c443f14 100644
--- a/server/tests/api/requests.js
+++ b/server/tests/api/request-schedulers.js
@@ -12,9 +12,9 @@ const podsUtils = require('../utils/pods')
 const serversUtils = require('../utils/servers')
 const videosUtils = require('../utils/videos')
 
-describe('Test requests stats', function () {
+describe('Test requests schedulers stats', function () {
   const requestSchedulerNames = [ 'requestScheduler', 'requestVideoQaduScheduler', 'requestVideoEventScheduler' ]
-  const path = '/api/v1/requests/stats'
+  const path = '/api/v1/request-schedulers/stats'
   let servers = []
 
   function uploadVideo (server, callback) {
diff --git a/server/tests/real-world/real-world.js b/server/tests/real-world/real-world.js
index 3ac13f053..ea189c5f2 100644
--- a/server/tests/real-world/real-world.js
+++ b/server/tests/real-world/real-world.js
@@ -13,7 +13,7 @@ const loginUtils = require('../utils/login')
 const podsUtils = require('../utils/pods')
 const serversUtils = require('../utils/servers')
 const videosUtils = require('../utils/videos')
-const requestStatsUtils = require('../utils/requests-stats')
+const requestSchedulersUtils = require('../utils/request-schedulers')
 
 program
   .option('-c, --create [weight]', 'Weight for creating videos')
@@ -344,7 +344,7 @@ function isThereAwaitingRequests (servers, callback) {
 
   // Check is each server has awaiting requestq
   each(servers, function (server, callbackEach) {
-    requestStatsUtils.getRequestsStats(server, server.accessToken, function (err, res) {
+    requestSchedulersUtils.getRequestsStats(server, server.accessToken, function (err, res) {
       if (err) throw err
 
       const stats = res.body
diff --git a/server/tests/utils/requests-stats.js b/server/tests/utils/request-schedulers.js
index 16835ce47..16835ce47 100644
--- a/server/tests/utils/requests-stats.js
+++ b/server/tests/utils/request-schedulers.js