From 10cb7415fd13fa6778f266e3cf1d0777e9db9b4a Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Fri, 12 Apr 2019 13:47:03 +0100 Subject: [PATCH] Fix requests count --- electrumx/server/session.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/electrumx/server/session.py b/electrumx/server/session.py index f305da1..46b76f9 100644 --- a/electrumx/server/session.py +++ b/electrumx/server/session.py @@ -279,7 +279,7 @@ class SessionManager(object): 'paused': sum(not s._can_send.is_set() for s in self.sessions), 'pid': os.getpid(), 'peers': self.peer_mgr.info(), - 'requests': sum(s.count_pending_items() for s in self.sessions), + 'requests': sum(s.processing_count for s in self.sessions), 'sessions': self.session_count(), 'sessions_with_subs': self.session_count_with_subs(), 'subs': self._sub_count(), @@ -299,7 +299,7 @@ class SessionManager(object): session.protocol_version_string(), session.cost, session.extra_cost(), - session.count_pending_items(), + session.processing_count, session.txs_sent, session.sub_count(), session.recv_count, session.recv_size, @@ -316,7 +316,7 @@ class SessionManager(object): len(sessions), sum(s.cost for s in sessions), group.retained_cost, - sum(s.count_pending_items() for s in sessions), + sum(s.processing_count for s in sessions), sum(s.txs_sent for s in sessions), sum(s.sub_count() for s in sessions), sum(s.recv_count for s in sessions), @@ -697,9 +697,6 @@ class SessionBase(RPCSession): self.logger.info(msg) super().connection_lost(exc) - def count_pending_items(self): - return len(self.connection.pending_requests()) - def sub_count(self): return 0