From cde61609731ea4b622754eb1baba07aaeb80aad7 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 30 Nov 2020 10:10:28 +0000 Subject: [PATCH] Merge pull request #3421 from overleaf/bg-fix-health-checks-for-web-closed fix load balancer health checks for web-closed GitOrigin-RevId: f46ecec4539740bc4f0324944b2b4d6273025211 --- .../app/src/Features/Errors/HttpErrorHandler.js | 7 ++++++- services/web/test/acceptance/src/CloseSiteTests.js | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/services/web/app/src/Features/Errors/HttpErrorHandler.js b/services/web/app/src/Features/Errors/HttpErrorHandler.js index c440239ad6..a3fcb40956 100644 --- a/services/web/app/src/Features/Errors/HttpErrorHandler.js +++ b/services/web/app/src/Features/Errors/HttpErrorHandler.js @@ -139,7 +139,12 @@ module.exports = HttpErrorHandler = { }, maintenance(req, res) { - res.status(503) + // load balancer health checks require a success response for / + if (req.url === '/') { + res.status(200) + } else { + res.status(503) + } let message = `${Settings.appName} is currently down for maintenance.` if (Settings.statusPageUrl) { message += ` Please check https://${Settings.statusPageUrl} for updates.` diff --git a/services/web/test/acceptance/src/CloseSiteTests.js b/services/web/test/acceptance/src/CloseSiteTests.js index 33854e8b94..fa459b1ce1 100644 --- a/services/web/test/acceptance/src/CloseSiteTests.js +++ b/services/web/test/acceptance/src/CloseSiteTests.js @@ -49,5 +49,19 @@ describe('siteIsOpen', function() { done() }) }) + + it('should return a 200 on / for load balancer health checks', function(done) { + request.get('/', (error, response, body) => { + response.statusCode.should.equal(200) + done() + }) + }) + + it('should return a 200 on /status for readiness checks', function(done) { + request.get('/status', (error, response, body) => { + response.statusCode.should.equal(200) + done() + }) + }) }) })