diff --git a/lib/cartodb/monitoring/health_check.js b/lib/cartodb/monitoring/health_check.js index f59fbfb1..e929cf7d 100644 --- a/lib/cartodb/monitoring/health_check.js +++ b/lib/cartodb/monitoring/health_check.js @@ -56,50 +56,7 @@ HealthCheck.prototype.check = function(config, callback) { throw err; } }, - function getDBParams(err) { - if (err) { - throw err; - } - startTime = Date.now(); - self.metadataBackend.getAllUserDBParams(config.username, this); - }, - function loadMapnik(err, dbParams) { - if (err) { - throw err; - } - result.redis = { - ok: !err, - elapsed: Date.now() - startTime, - size: Object.keys(dbParams).length - }; - mapnikOptions.xml = xmlTemplate(mapnikXmlParams); - - startTime = Date.now(); - self.tilelive.load(mapnikOptions, this); - }, - function getTile(err, source) { - if (err) { - throw err; - } - - result.mapnik = { - ok: !err, - elapsed: Date.now() - startTime - }; - - startTime = Date.now(); - source.getTile(config.z, config.x, config.y, this); - }, - function handleTile(err, tile) { - result.tile = { - ok: !err - }; - - if (tile) { - result.tile.elapsed = Date.now() - startTime; - result.tile.size = tile.length; - } - + function handleResult(err) { callback(err, result); } ); diff --git a/test/acceptance/health_check.js b/test/acceptance/health_check.js index 890b559e..682deedd 100644 --- a/test/acceptance/health_check.js +++ b/test/acceptance/health_check.js @@ -51,31 +51,6 @@ suite('health checks', function () { ); }); - test('fails for invalid user because it is not in redis', function (done) { - resetHealthConfig(); - - global.environment.health.username = 'invalid'; - - assert.response(server, - healthCheckRequest, - { - status: 503 - }, - function (res, err) { - assert.ok(!err); - - var parsed = JSON.parse(res.body); - - assert.equal(parsed.enabled, true); - assert.equal(parsed.ok, false); - - assert.equal(parsed.result.redis.ok, false); - - done(); - } - ); - }); - test('error if disabled file exists', function(done) { var fs = require('fs');