From b2f676af5a34baeb056f8b92a44e25156270f0ce Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 4 Jul 2017 12:41:51 +0100 Subject: [PATCH] avoid duplicate routes for /status --- services/web/app/coffee/infrastructure/Server.coffee | 3 --- services/web/app/coffee/router.coffee | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Server.coffee b/services/web/app/coffee/infrastructure/Server.coffee index c42590b15f..de467503bf 100644 --- a/services/web/app/coffee/infrastructure/Server.coffee +++ b/services/web/app/coffee/infrastructure/Server.coffee @@ -142,9 +142,6 @@ webRouter.use (req, res, next) -> res.status(503) res.render("general/closed", {title:"maintenance"}) -apiRouter.get "/status", (req, res)-> - res.send("web sharelatex is alive") - profiler = require "v8-profiler" apiRouter.get "/profile", (req, res) -> time = parseInt(req.query.time || "1000") diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index e04356e78b..369073cfc6 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -272,9 +272,9 @@ module.exports = class Router res.send("hello") webRouter.get '/status', (req,res)-> - res.send("websharelatex is up") + res.send("websharelatex is alive (web)") apiRouter.get '/status', (req,res)-> - res.send("websharelatex api is up") + res.send("websharelatex is alive (api)") webRouter.get '/dev/csrf', (req, res) -> res.send res.locals.csrfToken