From 9f31e023f425b78afedb5bef4c0a32a6f3c393c5 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Sat, 3 Jan 2015 09:10:14 +1100 Subject: [PATCH] Minor improvements for handling of `/status/` for Aphlict Summary: We don't need to handle any request data for the `/status/` route, so we can simplify this code slightly. Test Plan: ```lang=bash > curl http://127.0.0.1:22281/status/ {"uptime":2543,"clients.active":0,"clients.total":0,"messages.in":0,"messages.out":0,"log":"/var/log/aphlict.log","version":6} ``` Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D11145 --- support/aphlict/server/aphlict_server.js | 31 +++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/support/aphlict/server/aphlict_server.js b/support/aphlict/server/aphlict_server.js index c36187b553..4b9de8dd3d 100644 --- a/support/aphlict/server/aphlict_server.js +++ b/support/aphlict/server/aphlict_server.js @@ -226,26 +226,19 @@ http.createServer(function(request, response) { response.end(); } } else if (request.url == '/status/') { - request.on('data', function() { - // We just ignore the request data, but newer versions of Node don't - // get to 'end' if we don't process the data. See T2953. - }); + var status = { + 'uptime': (new Date().getTime() - start_time), + 'clients.active': clients.getActiveListenerCount(), + 'clients.total': clients.getTotalListenerCount(), + 'messages.in': messages_in, + 'messages.out': messages_out, + 'log': config.log, + 'version': 6 + }; - request.on('end', function() { - var status = { - 'uptime': (new Date().getTime() - start_time), - 'clients.active': clients.getActiveListenerCount(), - 'clients.total': clients.getTotalListenerCount(), - 'messages.in': messages_in, - 'messages.out': messages_out, - 'log': config.log, - 'version': 6 - }; - - response.writeHead(200, {'Content-Type': 'application/json'}); - response.write(JSON.stringify(status)); - response.end(); - }); + response.writeHead(200, {'Content-Type': 'application/json'}); + response.write(JSON.stringify(status)); + response.end(); } else { response.statusCode = 404; response.write('404 Not Found\n');