diff --git a/httpserver.js b/httpserver.js index e1e3175..f20856f 100644 --- a/httpserver.js +++ b/httpserver.js @@ -20,18 +20,31 @@ function formatData(data, format) { return JSON.stringify(data); } +function getStockKeyForDenom(denom) { + return 'stock.dompul.by-denom.' + denom; +} + function onHttpGetByDenom(request, response) { - var key = 'stock.dompul.by-denom.' + request.params.denom; + var key = getStockKeyForDenom(request.params.denom); redisClient.hgetall(key, function(err, obj) { if (err) { - response.end(); + response.end('Error: ' + err); return; } - if (request.params.total != true) { - response.end(formatData(obj, request.params.format)); + response.end(formatData(obj, request.params.format)); + }); +} + +function onHttpGetTotalByDenom(request, response) { + var key = getStockKeyForDenom(request.params.denom); + + redisClient.hgetall(key, function(err, obj) { + + if (err) { + response.end('Error: ' + err); return; } @@ -49,11 +62,7 @@ function onHttpGetByDenom(request, response) { function createServer() { router.get('/realtime-report/stock/:denom/index/:format', onHttpGetByDenom); - - router.get('/realtime-report/stock/denoms/:denom/total', function(req, res) { - req.params.total = true; - onHttpGetByDenom(req, res); - }); + router.get('/realtime-report/stock/:denom/total', onHttpGetTotalByDenom); httpServer = http.createServer(router).listen(config.httpserver.listen_port); console.log('HTTP server listens on port ' + config.httpserver.listen_port);