From 3a520cdfbf2548c88a52c801db5bdec2c825b365 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 30 Nov 2015 23:10:59 -0500 Subject: [PATCH] Successful web installer now doesn't show 503 --- package.json | 2 +- public/src/installer/install.js | 2 +- src/middleware/middleware.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 419c655c0d..cd19e19b81 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "nodebb-rewards-essentials": "0.0.6", "nodebb-theme-lavender": "3.0.1", "nodebb-theme-persona": "4.0.38", - "nodebb-theme-vanilla": "5.0.14", + "nodebb-theme-vanilla": "5.0.15", "nodebb-widget-essentials": "2.0.5", "nodemailer": "0.7.1", "npm": "^2.1.4", diff --git a/public/src/installer/install.js b/public/src/installer/install.js index 56645f0301..f7224fb71a 100644 --- a/public/src/installer/install.js +++ b/public/src/installer/install.js @@ -115,7 +115,7 @@ $('document').ready(function() { $.post('/launch', function() { setInterval(function() { - $.get('/admin', function(data) { + $.get('/admin').done(function(data) { window.location = 'admin'; }); }, 750); diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index e2c5747ab6..059e2229d0 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -222,7 +222,7 @@ middleware.privateUploads = function(req, res, next) { middleware.busyCheck = function(req, res, next) { if (global.env === 'production' && (!meta.config.hasOwnProperty('eventLoopCheckEnabled') || parseInt(meta.config.eventLoopCheckEnabled, 10) === 1) && toobusy()) { - res.type('text/html').sendFile(path.join(__dirname, '../../public/503.html')); + res.status(503).type('text/html').sendFile(path.join(__dirname, '../../public/503.html')); } else { next(); }