From c11a60ea63f1d029a7aeb362ef8ee85046033189 Mon Sep 17 00:00:00 2001 From: Alexey Kasyanchuk Date: Thu, 24 Aug 2017 10:03:30 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=82=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 716c820e5b43f9dc26b87dfaafc7cf0ed33fd471. эксперементальный трафик --- bt/client.js | 4 ---- bt/spider.js | 22 +++++++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bt/client.js b/bt/client.js index 8310d01..f2904b6 100644 --- a/bt/client.js +++ b/bt/client.js @@ -71,10 +71,6 @@ class Client extends Emiter socket.destroy(); }); - socket.on('data', (data) => { - this.emit('traffic', data.length); - }) - socket.on('timeout', (err) => { socket.destroy(); }); diff --git a/bt/spider.js b/bt/spider.js index a456a5c..93c3f48 100644 --- a/bt/spider.js +++ b/bt/spider.js @@ -7,6 +7,7 @@ const {Table, Node} = require('./table') const Token = require('./token') const cpuUsage = require('./cpu-usage') const config = require('../config') +const fs = require('fs') const _debug = require('debug') const cpuDebug = _debug('cpu') @@ -45,6 +46,7 @@ class Spider extends Emiter { this.ignore = false; // ignore all requests this.initialized = false; this.traffic = 0; + this.trafficSpeed = 0 this.walkInterval = config.spider.walkInterval; this.cpuLimit = config.spider.cpuLimit; @@ -206,7 +208,6 @@ class Spider extends Emiter { }) this.udp.on('message', (data, addr) => { this.parse(data, addr) - this.traffic += data.length }) this.udp.on('error', (err) => {}) setInterval(() => { @@ -217,13 +218,20 @@ class Spider extends Emiter { this.join() this.walk() setInterval(() => { - console.log(this.traffic / 1024, 'kb/s') - this.traffic = 0 - }, 1000) - if(this.client) - this.client.on('traffic', (traffic) => { - this.traffic += traffic + fs.readFile('/sys/class/net/enp2s0/statistics/rx_bytes', (err, data) => { + if(!err) + return + + if(this.traffic === 0) + this.traffic = data + + this.trafficSpeed = data - this.traffic + + console.log(this.trafficSpeed / 1024, 'kbps/s') + + this.traffic = data }) + }, 1000) } }