From 7d9f056e9b4a69dfd2396237f5e51745303cc12d Mon Sep 17 00:00:00 2001
From: Naz <nazargargol@gmail.com>
Date: Thu, 28 Jan 2021 14:23:09 +1300
Subject: [PATCH] Added error handling and response formatting in maintenance

---
 core/server/web/maintenance/index.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/core/server/web/maintenance/index.js b/core/server/web/maintenance/index.js
index 55f2a0461b..f99de8024a 100644
--- a/core/server/web/maintenance/index.js
+++ b/core/server/web/maintenance/index.js
@@ -2,6 +2,9 @@ const hbs = require('express-hbs');
 const compress = require('compression');
 const debug = require('ghost-ignition').debug('web:maintenance');
 const constants = require('@tryghost/constants');
+const errors = require('@tryghost/errors');
+const {i18n} = require('../../lib/common');
+const logging = require('../../../shared/logging');
 const express = require('../../../shared/express');
 const config = require('../../../shared/config');
 const {servePublicFile} = require('../site/middleware');
@@ -35,12 +38,18 @@ module.exports = function setupMaintenanceApp() {
     app.use(servePublicFile('public/404-ghost.png', 'image/png', constants.ONE_HOUR_S));
 
     app.use('/', (req, res) => {
-        const data = {
-            message: 'Maintenance',
-            statusCode: 503
-        };
+        const error = new errors.MaintenanceError({
+            message: i18n.t('errors.general.maintenance')
+        });
 
-        res.render('error', data, (err, html) => {
+        logging.error({req: req, res: res, err: error});
+
+        // never cache errors
+        res.set({
+            'Cache-Control': 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'
+        });
+        res.status(error.statusCode);
+        res.render('error', error, (err, html) => {
             return res.send(html);
         });
     });