From 48a5c004b3ad397d0a4f410f1de2a0be15564453 Mon Sep 17 00:00:00 2001 From: Adhidarma Hadiwinoto <me@adhisimon.org> Date: Mon, 19 Aug 2019 11:52:53 +0700 Subject: [PATCH] MIgration message from config.handler_callback_server to config.apiserver --- lib/apiserver/index.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/apiserver/index.js b/lib/apiserver/index.js index 57ae394..d7cf887 100644 --- a/lib/apiserver/index.js +++ b/lib/apiserver/index.js @@ -20,11 +20,15 @@ const history = require('../history'); const routerModems = require('./router-modems'); +if (config.handler_callback_server) { + logger.warn('Deprecated config.handler_callback_server. Please migrate it to config.apiserver!'); +} + const app = express(); messagingService.setTransport(transport); function apikeyChecker(req, res, next) { - res.locals.has_valid_apikey = req.params.apikey === config.handler_callback_server.apikey; + res.locals.has_valid_apikey = req.params.apikey === (config.apiserver.apikey || config.handler_callback_server.apikey); if (res.locals.has_valid_apikey) { next(); } @@ -110,7 +114,13 @@ app.get('/apikey/:apikey/on-sms/inbox', onIncomingSms); app.get('/apikey/:apikey/history', pageHistory); app.use('/apikey/:apikey/modems', routerModems); -const listenPort = config && config.handler_callback_server ? config.handler_callback_server.listen_port : null; -listenPort && app.listen(listenPort, () => { - logger.info('HTTP Handler Callback server listening on port ' + listenPort); -}) \ No newline at end of file +const listenPort = (config && config.apiserver && config.apiserver.listen_port ? config.apiserver.listen_port : null) + || (config && config.handler_callback_server ? config.handler_callback_server.listen_port : null); + +if (listenPort) { + app.listen(listenPort, () => { + logger.info('HTTP Handler Callback server listening on port ' + listenPort); + }); +} else { + logger.warn('Undefined config.apiserver.listen_port for APISERVER. Not listening for command.'); +} -- 1.9.0