grassrootseconomics/ethstats-server
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #175 from cubedro/develop

Browse Source 
Improved logging
This commit is contained in:
Marian OANCΞA 2015-06-02 16:55:47 +03:00
commit f04897d3d2
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app.js
View File

@ -83,21 +83,18 @@ var clientLatency = 0;
client.use('emit', require('primus-emit')); client.use('emit', require('primus-emit'));
api.on('connection', function(spark) { api.on('connection', function (spark)
console.log('Latency: ', spark.latency); {
console.log(spark.id); console.log(_.now(), "Socket api connection:", spark.address.ip);
console.log(spark.address);
console.log(spark.query);
spark.on('hello', function(data) spark.on('hello', function (data)
{ {
console.log('Latency: ', spark.latency); console.log(_.now(), "Socket api hello", data);
console.log('Got hello data from ', spark.id);
console.log(data);
if( _.isUndefined(data.secret) || data.secret !== WS_SECRET ) if( _.isUndefined(data.secret) || data.secret !== WS_SECRET )
{ {
spark.end(undefined, { reconnect: false }); spark.end(undefined, { reconnect: false });
console.log(_.now(), "Socket api connection closed - wrong auth", data);
return false; return false;
} }
@ -123,8 +120,10 @@ api.on('connection', function(spark) {
} }
}); });
spark.on('update', function(data) spark.on('update', function (data)
{ {
console.log(_.now(), "Socket api update", data);
if( !_.isUndefined(data.id) && !_.isUndefined(data.stats) ) if( !_.isUndefined(data.id) && !_.isUndefined(data.stats) )
{ {
var stats = Nodes.update(data.id, data.stats); var stats = Nodes.update(data.id, data.stats);
@ -144,8 +143,10 @@ api.on('connection', function(spark) {
} }
}); });
spark.on('block', function(data) spark.on('block', function (data)
{ {
console.log(_.now(), "Socket api block", data);
if( !_.isUndefined(data.id) && !_.isUndefined(data.block) ) if( !_.isUndefined(data.id) && !_.isUndefined(data.block) )
{ {
var stats = Nodes.addBlock(data.id, data.block); var stats = Nodes.addBlock(data.id, data.block);
@ -165,8 +166,10 @@ api.on('connection', function(spark) {
} }
}); });
spark.on('pending', function(data) spark.on('pending', function (data)
{ {
console.log(_.now(), "Socket api pending", data);
if( !_.isUndefined(data.id) && !_.isUndefined(data.stats) ) if( !_.isUndefined(data.id) && !_.isUndefined(data.stats) )
{ {
var stats = Nodes.updatePending(data.id, data.stats); var stats = Nodes.updatePending(data.id, data.stats);
@ -181,8 +184,10 @@ api.on('connection', function(spark) {
} }
}); });
spark.on('stats', function(data) spark.on('stats', function (data)
{ {
console.log(_.now(), "Socket api stats", data);
if( !_.isUndefined(data.id) && !_.isUndefined(data.stats) ) if( !_.isUndefined(data.id) && !_.isUndefined(data.stats) )
{ {
var stats = Nodes.updateStats(data.id, data.stats); var stats = Nodes.updateStats(data.id, data.stats);
@ -197,7 +202,7 @@ api.on('connection', function(spark) {
} }
}); });
spark.on('history', function(data) spark.on('history', function (data)
{ {
console.log("got history from " + data.id); console.log("got history from " + data.id);
@ -244,8 +249,10 @@ api.on('connection', function(spark) {
} }
}); });
spark.on('end', function(data) spark.on('end', function (data)
{ {
console.log(_.now(), "Socket api connection end", data);
var stats = Nodes.inactive(spark.id); var stats = Nodes.inactive(spark.id);
client.write({ client.write({