diff --git a/src/routes/services.js b/src/routes/services.js index 588bbdb45..422a0057c 100644 --- a/src/routes/services.js +++ b/src/routes/services.js @@ -16,9 +16,7 @@ const assert = require('assert'), services = require('../services.js'); function getAll(req, res, next) { - req.clearTimeout(); // can take a while to get status of all services - - services.getServices(function (error, result) { + services.getServiceIds(function (error, result) { if (error) return next(BoxError.toHttpError(error)); next(new HttpSuccess(200, { services: result })); diff --git a/src/services.js b/src/services.js index 5ea620a22..bebaa96a1 100644 --- a/src/services.js +++ b/src/services.js @@ -1,7 +1,7 @@ 'use strict'; exports = module.exports = { - getServices, + getServiceIds, getService, getServiceConfig, configureService, @@ -347,19 +347,19 @@ function containerStatus(containerName, tokenEnvName, callback) { }); } -function getServices(callback) { +function getServiceIds(callback) { assert.strictEqual(typeof callback, 'function'); - let services = Object.keys(SERVICES); + let serviceIds = Object.keys(SERVICES); appdb.getAll(function (error, apps) { if (error) return callback(error); for (let app of apps) { - if (app.manifest.addons && app.manifest.addons['redis']) services.push(`redis:${app.id}`); + if (app.manifest.addons && app.manifest.addons['redis']) serviceIds.push(`redis:${app.id}`); } - callback(null, services); + callback(null, serviceIds); }); }