From b589ab388f3e03afa66281a27a30a1a2e98fe33c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 19 Jul 2016 17:03:31 +0100 Subject: [PATCH] fix close editor button - only evaulate close on web router, not api/static assets - allow /admin pages to still be available --- services/web/app/coffee/infrastructure/Server.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Server.coffee b/services/web/app/coffee/infrastructure/Server.coffee index 3b40ff6885..8ac543c698 100644 --- a/services/web/app/coffee/infrastructure/Server.coffee +++ b/services/web/app/coffee/infrastructure/Server.coffee @@ -101,19 +101,19 @@ if app.get('env') == 'production' logger.info "Production Enviroment" app.enable('view cache') - - app.use (req, res, next)-> metrics.inc "http-request" crawlerLogger.log(req) next() -app.use (req, res, next) -> - if !Settings.editorIsOpen +webRouter.use (req, res, next) -> + if Settings.editorIsOpen + next() + else if req.url.indexOf("/admin") == 0 + next() + else res.status(503) res.render("general/closed", {title:"maintenance"}) - else - next() apiRouter.get "/status", (req, res)-> res.send("web sharelatex is alive")