From 62d6933886c6db01ba9dd4d2d70d09e19620cada Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Tue, 6 Jun 2017 11:31:29 +0100 Subject: [PATCH] use settings instead of ENV for web/api split --- .../app/coffee/infrastructure/Server.coffee | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Server.coffee b/services/web/app/coffee/infrastructure/Server.coffee index ab636e8d53..c42590b15f 100644 --- a/services/web/app/coffee/infrastructure/Server.coffee +++ b/services/web/app/coffee/infrastructure/Server.coffee @@ -161,25 +161,21 @@ app.get "/heapdump", (req, res)-> logger.info ("creating HTTP server").yellow server = require('http').createServer(app) -# can set WEB_TYPE=api-only or WEB_TYPE=web-only for separate web and -# api processes -switch process.env.WEB_TYPE - when "api-only" - logger.info("providing api router"); - app.use(apiRouter) - app.use(ErrorController.handleApiError) - when "web-only" - logger.info("providing web router"); - app.use(webRouter) - app.use(ErrorController.handleError) - else - logger.info("providing web and api router"); - # process api routes first, if nothing matched fall though and use - # web middleware + routes - app.use(apiRouter) - app.use(ErrorController.handleApiError) - app.use(webRouter) - app.use(ErrorController.handleError) +# provide settings for separate web and api processes +# if enableApiRouter and enableWebRouter are not defined they default +# to true. +notDefined = (x) -> !x? +enableApiRouter = Settings.web?.enableApiRouter +if enableApiRouter or notDefined(enableApiRouter) + logger.info("providing api router"); + app.use(apiRouter) + app.use(ErrorController.handleApiError) + +enableWebRouter = Settings.web?.enableWebRouter +if enableWebRouter or notDefined(enableWebRouter) + logger.info("providing web router"); + app.use(webRouter) + app.use(ErrorController.handleError) router = new Router(webRouter, apiRouter)