More test stuff... make it more granular and less batch based.

1 files changed, 10 insertions, 30 deletions

diff --git a/tests/http/server.js b/tests/http/server.js
index 30d8339a..57109392 100644
--- a/tests/http/server.js
+++ b/tests/http/server.js
@@ -20,42 +20,22 @@ app.use(function(req,res,next) {
 
 var knownAgents = {};
 
-app.get('/:agentId',function(req,res) {
-	var agentId = req.params.agentId;
-	if ((!agentId)||(agentId.length !== 32))
-		return res.status(404).send('');
-	knownAgents[agentId] = Date.now();
-	return res.status(200).send(JSON.stringify(Object.keys(knownAgents)));
-});
-
-app.post('/:testNumber/:agentId',function(req,res) {
-	var testNumber = req.params.testNumber;
+app.post('/:agentId',function(req,res) {
 	var agentId = req.params.agentId;
 	if ((!agentId)||(agentId.length !== 32))
 		return res.status(404).send('');
 
-	var receiveTime = Date.now();
-	var resultData = null;
-	try {
-		resultData = JSON.parse(req.rawBody);
-	} catch (e) {
-		resultData = req.rawBody;
+	if (req.rawBody) {
+		var receiveTime = Date.now();
+		var resultData = null;
+		try {
+			resultData = JSON.parse(req.rawBody);
+			console.log(resultData.source+','+resultData.target+','+resultData.time+','+resultData.bytes+','+resultData.timedOut+',"'+((resultData.error) ? resultData.error : '')+'"');
+		} catch (e) {}
 	}
-	result = {
-		agentId: agentId,
-		testNumber: parseInt(testNumber),
-		receiveTime: receiveTime,
-		results: resultData
-	};
-
-	testNumber = testNumber.toString();
-	while (testNumber.length < 10)
-		testNumber = '0' + testNumber;
-	fs.writeFile('result_'+testNumber+'_'+agentId,JSON.stringify(result),function(err) {
-		console.log(result);
-	});
 
-	return res.status(200).send('');
+	knownAgents[agentId] = Date.now();
+	return res.status(200).send(JSON.stringify(Object.keys(knownAgents)));
 });
 
 var expressServer = app.listen(SERVER_PORT,function () {