aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-06-25 17:19:46 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-06-25 17:19:46 +0200
commite636eb88101a51399057c86477af6677f5614d48 (patch)
treeba56f0da932613c8013a2c52905ded1987cd6d6d /server
parent4f133041819409a72cf70fa2fa6c4df14c6de4fd (diff)
downloadPeerTube-e636eb88101a51399057c86477af6677f5614d48.tar.gz
PeerTube-e636eb88101a51399057c86477af6677f5614d48.tar.zst
PeerTube-e636eb88101a51399057c86477af6677f5614d48.zip
Requests -> RequestSchedulers
Diffstat (limited to 'server')
-rw-r--r--server/controllers/api/index.ts4
-rw-r--r--server/controllers/api/request-schedulers.ts (renamed from server/controllers/api/requests.ts)22
-rw-r--r--server/tests/api/check-params/index.js2
-rw-r--r--server/tests/api/check-params/request-schedulers.js (renamed from server/tests/api/check-params/requests.js)4
-rw-r--r--server/tests/api/index.js2
-rw-r--r--server/tests/api/request-schedulers.js (renamed from server/tests/api/requests.js)4
-rw-r--r--server/tests/real-world/real-world.js4
-rw-r--r--server/tests/utils/request-schedulers.js (renamed from server/tests/utils/requests-stats.js)0
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'
6import { configRouter } from './config' 6import { configRouter } from './config'
7import { podsRouter } from './pods' 7import { podsRouter } from './pods'
8import { remoteRouter } from './remote' 8import { remoteRouter } from './remote'
9import { requestsRouter } from './requests' 9import { requestSchedulerRouter } from './request-schedulers'
10import { usersRouter } from './users' 10import { usersRouter } from './users'
11import { videosRouter } from './videos' 11import { videosRouter } from './videos'
12 12
@@ -16,7 +16,7 @@ apiRouter.use('/clients', clientsRouter)
16apiRouter.use('/config', configRouter) 16apiRouter.use('/config', configRouter)
17apiRouter.use('/pods', podsRouter) 17apiRouter.use('/pods', podsRouter)
18apiRouter.use('/remote', remoteRouter) 18apiRouter.use('/remote', remoteRouter)
19apiRouter.use('/requests', requestsRouter) 19apiRouter.use('/request-schedulers', requestSchedulerRouter)
20apiRouter.use('/users', usersRouter) 20apiRouter.use('/users', usersRouter)
21apiRouter.use('/videos', videosRouter) 21apiRouter.use('/videos', videosRouter)
22apiRouter.use('/ping', pong) 22apiRouter.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 {
8 getRequestVideoEventScheduler 8 getRequestVideoEventScheduler
9} from '../../lib' 9} from '../../lib'
10import { authenticate, ensureIsAdmin } from '../../middlewares' 10import { authenticate, ensureIsAdmin } from '../../middlewares'
11import { RequestSchedulerAttributes } from '../../../shared' 11import { RequestSchedulerStatsAttributes } from '../../../shared'
12 12
13const requestsRouter = express.Router() 13const requestSchedulerRouter = express.Router()
14 14
15requestsRouter.get('/stats', 15requestSchedulerRouter.get('/stats',
16 authenticate, 16 authenticate,
17 ensureIsAdmin, 17 ensureIsAdmin,
18 getStatsRequests 18 getRequestSchedulersStats
19) 19)
20 20
21// --------------------------------------------------------------------------- 21// ---------------------------------------------------------------------------
22 22
23export { 23export {
24 requestsRouter 24 requestSchedulerRouter
25} 25}
26 26
27// --------------------------------------------------------------------------- 27// ---------------------------------------------------------------------------
28 28
29function getStatsRequests (req: express.Request, res: express.Response, next: express.NextFunction) { 29function getRequestSchedulersStats (req: express.Request, res: express.Response, next: express.NextFunction) {
30 parallel({ 30 parallel({
31 requestScheduler: buildRequestSchedulerFunction(getRequestScheduler()), 31 requestScheduler: buildRequestSchedulerStats(getRequestScheduler()),
32 requestVideoQaduScheduler: buildRequestSchedulerFunction(getRequestVideoQaduScheduler()), 32 requestVideoQaduScheduler: buildRequestSchedulerStats(getRequestVideoQaduScheduler()),
33 requestVideoEventScheduler: buildRequestSchedulerFunction(getRequestVideoEventScheduler()) 33 requestVideoEventScheduler: buildRequestSchedulerStats(getRequestVideoEventScheduler())
34 }, function (err, result) { 34 }, function (err, result) {
35 if (err) return next(err) 35 if (err) return next(err)
36 36
@@ -40,12 +40,12 @@ function getStatsRequests (req: express.Request, res: express.Response, next: ex
40 40
41// --------------------------------------------------------------------------- 41// ---------------------------------------------------------------------------
42 42
43function buildRequestSchedulerFunction (requestScheduler: AbstractRequestScheduler) { 43function buildRequestSchedulerStats (requestScheduler: AbstractRequestScheduler) {
44 return function (callback) { 44 return function (callback) {
45 requestScheduler.remainingRequestsCount(function (err, count) { 45 requestScheduler.remainingRequestsCount(function (err, count) {
46 if (err) return callback(err) 46 if (err) return callback(err)
47 47
48 const result: RequestSchedulerAttributes = { 48 const result: RequestSchedulerStatsAttributes = {
49 totalRequests: count, 49 totalRequests: count,
50 requestsLimitPods: requestScheduler.limitPods, 50 requestsLimitPods: requestScheduler.limitPods,
51 requestsLimitPerPod: requestScheduler.limitPerPod, 51 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 @@
4require('./pods') 4require('./pods')
5require('./remotes') 5require('./remotes')
6require('./users') 6require('./users')
7require('./requests') 7require('./request-schedulers')
8require('./videos') 8require('./videos')
9require('./video-abuses') 9require('./video-abuses')
10require('./video-blacklists') 10require('./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')
9const usersUtils = require('../../utils/users') 9const usersUtils = require('../../utils/users')
10const serversUtils = require('../../utils/servers') 10const serversUtils = require('../../utils/servers')
11 11
12describe('Test requests API validators', function () { 12describe('Test request schedulers stats API validators', function () {
13 const path = '/api/v1/requests/stats' 13 const path = '/api/v1/request-schedulers/stats'
14 let server = null 14 let server = null
15 let userAccessToken = null 15 let userAccessToken = null
16 16
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')
9require('./video-abuse') 9require('./video-abuse')
10require('./video-blacklist') 10require('./video-blacklist')
11require('./multiple-pods') 11require('./multiple-pods')
12require('./requests') 12require('./request-schedulers')
13require('./friends-advanced') 13require('./friends-advanced')
14require('./video-transcoder') 14require('./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')
12const serversUtils = require('../utils/servers') 12const serversUtils = require('../utils/servers')
13const videosUtils = require('../utils/videos') 13const videosUtils = require('../utils/videos')
14 14
15describe('Test requests stats', function () { 15describe('Test requests schedulers stats', function () {
16 const requestSchedulerNames = [ 'requestScheduler', 'requestVideoQaduScheduler', 'requestVideoEventScheduler' ] 16 const requestSchedulerNames = [ 'requestScheduler', 'requestVideoQaduScheduler', 'requestVideoEventScheduler' ]
17 const path = '/api/v1/requests/stats' 17 const path = '/api/v1/request-schedulers/stats'
18 let servers = [] 18 let servers = []
19 19
20 function uploadVideo (server, callback) { 20 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')
13const podsUtils = require('../utils/pods') 13const podsUtils = require('../utils/pods')
14const serversUtils = require('../utils/servers') 14const serversUtils = require('../utils/servers')
15const videosUtils = require('../utils/videos') 15const videosUtils = require('../utils/videos')
16const requestStatsUtils = require('../utils/requests-stats') 16const requestSchedulersUtils = require('../utils/request-schedulers')
17 17
18program 18program
19 .option('-c, --create [weight]', 'Weight for creating videos') 19 .option('-c, --create [weight]', 'Weight for creating videos')
@@ -344,7 +344,7 @@ function isThereAwaitingRequests (servers, callback) {
344 344
345 // Check is each server has awaiting requestq 345 // Check is each server has awaiting requestq
346 each(servers, function (server, callbackEach) { 346 each(servers, function (server, callbackEach) {
347 requestStatsUtils.getRequestsStats(server, server.accessToken, function (err, res) { 347 requestSchedulersUtils.getRequestsStats(server, server.accessToken, function (err, res) {
348 if (err) throw err 348 if (err) throw err
349 349
350 const stats = res.body 350 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