Commit f83d14a26507a006c7ab9cbd470d1003e72cf1c8
1 parent
b3419340d6
Exists in
master
recleaning
Showing 1 changed file with 18 additions and 9 deletions Side-by-side Diff
httpserver.js
... | ... | @@ -20,18 +20,31 @@ function formatData(data, format) { |
20 | 20 | return JSON.stringify(data); |
21 | 21 | } |
22 | 22 | |
23 | +function getStockKeyForDenom(denom) { | |
24 | + return 'stock.dompul.by-denom.' + denom; | |
25 | +} | |
26 | + | |
23 | 27 | function onHttpGetByDenom(request, response) { |
24 | - var key = 'stock.dompul.by-denom.' + request.params.denom; | |
28 | + var key = getStockKeyForDenom(request.params.denom); | |
25 | 29 | |
26 | 30 | redisClient.hgetall(key, function(err, obj) { |
27 | 31 | |
28 | 32 | if (err) { |
29 | - response.end(); | |
33 | + response.end('Error: ' + err); | |
30 | 34 | return; |
31 | 35 | } |
32 | 36 | |
33 | - if (request.params.total != true) { | |
34 | - response.end(formatData(obj, request.params.format)); | |
37 | + response.end(formatData(obj, request.params.format)); | |
38 | + }); | |
39 | +} | |
40 | + | |
41 | +function onHttpGetTotalByDenom(request, response) { | |
42 | + var key = getStockKeyForDenom(request.params.denom); | |
43 | + | |
44 | + redisClient.hgetall(key, function(err, obj) { | |
45 | + | |
46 | + if (err) { | |
47 | + response.end('Error: ' + err); | |
35 | 48 | return; |
36 | 49 | } |
37 | 50 | |
... | ... | @@ -49,11 +62,7 @@ function onHttpGetByDenom(request, response) { |
49 | 62 | |
50 | 63 | function createServer() { |
51 | 64 | router.get('/realtime-report/stock/:denom/index/:format', onHttpGetByDenom); |
52 | - | |
53 | - router.get('/realtime-report/stock/denoms/:denom/total', function(req, res) { | |
54 | - req.params.total = true; | |
55 | - onHttpGetByDenom(req, res); | |
56 | - }); | |
65 | + router.get('/realtime-report/stock/:denom/total', onHttpGetTotalByDenom); | |
57 | 66 | |
58 | 67 | httpServer = http.createServer(router).listen(config.httpserver.listen_port); |
59 | 68 | console.log('HTTP server listens on port ' + config.httpserver.listen_port); |