From a90919a9ba89c3f289f80984f62eb7dfe10ecc2d Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Tue, 4 Jun 2019 19:35:34 -0400 Subject: [PATCH] mbps instead of mbs, remove time from connection status --- lbrynet/connection_manager.py | 13 ++++++------- lbrynet/extras/daemon/Daemon.py | 5 ++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lbrynet/connection_manager.py b/lbrynet/connection_manager.py index 342989a7e..661da9711 100644 --- a/lbrynet/connection_manager.py +++ b/lbrynet/connection_manager.py @@ -52,9 +52,8 @@ class ConnectionManager: self._status = { 'incoming_bps': {}, 'outgoing_bps': {}, - 'total_incoming_mbs': 0.0, - 'total_outgoing_mbs': 0.0, - 'time': self.loop.time() + 'total_incoming_mbps': 0.0, + 'total_outgoing_mbps': 0.0, } while True: @@ -69,10 +68,10 @@ class ConnectionManager: k, v = self.incoming.popitem() self._status['incoming_bps'][k] = v now = self.loop.time() - self._status['total_outgoing_mbs'] = int(sum(list(self._status['outgoing_bps'].values()) - ) / (now - last)) / 1000000.0 - self._status['total_incoming_mbs'] = int(sum(list(self._status['incoming_bps'].values()) - ) / (now - last)) / 1000000.0 + self._status['total_outgoing_mbps'] = int(sum(list(self._status['outgoing_bps'].values())) + / (now - last)) / 1000000.0 + self._status['total_incoming_mbps'] = int(sum(list(self._status['incoming_bps'].values())) + / (now - last)) / 1000000.0 self._status['time'] = now def stop(self): diff --git a/lbrynet/extras/daemon/Daemon.py b/lbrynet/extras/daemon/Daemon.py index 272a946e5..5c361a436 100644 --- a/lbrynet/extras/daemon/Daemon.py +++ b/lbrynet/extras/daemon/Daemon.py @@ -747,9 +747,8 @@ class Daemon(metaclass=JSONRPCServerType): 'outgoing_bps': { : (int) bytes per second sent, }, - 'total_outgoing_mps': (float) megabytes per second sent, - 'total_incoming_mps': (float) megabytes per second received, - 'time': (float) timestamp + 'total_outgoing_mbps': (float) megabytes per second sent, + 'total_incoming_mbps': (float) megabytes per second received } }, 'hash_announcer': {