mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-10-04 10:19:35 +02:00
Move to promises
Closes https://github.com/Chocobozzz/PeerTube/issues/74
This commit is contained in:
parent
5fe7e89831
commit
6fcd19ba73
88 changed files with 1980 additions and 2505 deletions
|
@ -1,5 +1,5 @@
|
|||
import * as express from 'express'
|
||||
import { parallel } from 'async'
|
||||
import * as Promise from 'bluebird'
|
||||
|
||||
import {
|
||||
AbstractRequestScheduler,
|
||||
|
@ -27,33 +27,27 @@ export {
|
|||
// ---------------------------------------------------------------------------
|
||||
|
||||
function getRequestSchedulersStats (req: express.Request, res: express.Response, next: express.NextFunction) {
|
||||
parallel({
|
||||
Promise.props({
|
||||
requestScheduler: buildRequestSchedulerStats(getRequestScheduler()),
|
||||
requestVideoQaduScheduler: buildRequestSchedulerStats(getRequestVideoQaduScheduler()),
|
||||
requestVideoEventScheduler: buildRequestSchedulerStats(getRequestVideoEventScheduler())
|
||||
}, function (err, result) {
|
||||
if (err) return next(err)
|
||||
|
||||
return res.json(result)
|
||||
})
|
||||
.then(result => res.json(result))
|
||||
.catch(err => next(err))
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
function buildRequestSchedulerStats (requestScheduler: AbstractRequestScheduler) {
|
||||
return function (callback) {
|
||||
requestScheduler.remainingRequestsCount(function (err, count) {
|
||||
if (err) return callback(err)
|
||||
function buildRequestSchedulerStats (requestScheduler: AbstractRequestScheduler<any>) {
|
||||
return requestScheduler.remainingRequestsCount().then(count => {
|
||||
const result: RequestSchedulerStatsAttributes = {
|
||||
totalRequests: count,
|
||||
requestsLimitPods: requestScheduler.limitPods,
|
||||
requestsLimitPerPod: requestScheduler.limitPerPod,
|
||||
remainingMilliSeconds: requestScheduler.remainingMilliSeconds(),
|
||||
milliSecondsInterval: requestScheduler.requestInterval
|
||||
}
|
||||
|
||||
const result: RequestSchedulerStatsAttributes = {
|
||||
totalRequests: count,
|
||||
requestsLimitPods: requestScheduler.limitPods,
|
||||
requestsLimitPerPod: requestScheduler.limitPerPod,
|
||||
remainingMilliSeconds: requestScheduler.remainingMilliSeconds(),
|
||||
milliSecondsInterval: requestScheduler.requestInterval
|
||||
}
|
||||
|
||||
return callback(null, result)
|
||||
})
|
||||
}
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue