aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
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/controllers
parent4f133041819409a72cf70fa2fa6c4df14c6de4fd (diff)
downloadPeerTube-e636eb88101a51399057c86477af6677f5614d48.tar.gz
PeerTube-e636eb88101a51399057c86477af6677f5614d48.tar.zst
PeerTube-e636eb88101a51399057c86477af6677f5614d48.zip
Requests -> RequestSchedulers
Diffstat (limited to 'server/controllers')
-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
2 files changed, 13 insertions, 13 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,