Move to promises

Closes https://github.com/Chocobozzz/PeerTube/issues/74

1 files changed, 16 insertions, 22 deletions

diff --git a/server/controllers/api/request-schedulers.ts b/server/controllers/api/request-schedulers.ts
index 8dd849007..2a934a512 100644
--- a/server/controllers/api/request-schedulers.ts
+++ b/server/controllers/api/request-schedulers.ts
@@ -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)
-
-      const result: RequestSchedulerStatsAttributes = {
-        totalRequests: count,
-        requestsLimitPods: requestScheduler.limitPods,
-        requestsLimitPerPod: requestScheduler.limitPerPod,
-        remainingMilliSeconds: requestScheduler.remainingMilliSeconds(),
-        milliSecondsInterval: requestScheduler.requestInterval
-      }
-
-      return callback(null, result)
-    })
-  }
+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
+    }
+
+    return result
+  })
 }