From bb17af1906e62f5294b3b73f9f5278f3bf414423 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Mon, 12 Dec 2016 07:38:40 +0900 Subject: [PATCH] Fix mempool busy waiting Prepare 0.9.2 --- RELEASE-NOTES | 5 +++++ server/mempool.py | 11 ++++++----- server/version.py | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 83deca7..55a6e95 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,3 +1,8 @@ +version 0.9.2 +------------- + +- fix mempool busy waiting + version 0.9.1 ------------- diff --git a/server/mempool.py b/server/mempool.py index 7cdf7f2..5f53e4e 100644 --- a/server/mempool.py +++ b/server/mempool.py @@ -91,11 +91,12 @@ class MemPool(util.LoggedClass): if self.touched: self.touched_event.set() - if log_secs <= 0 and not unprocessed: - log_secs = log_every - self.logger.info('{:,d} txs touching {:,d} addresses' - .format(len(self.txs), - len(self.hash168s))) + if not unprocessed: + if log_secs <= 0: + log_secs = log_every + self.logger.info('{:,d} txs touching {:,d} addresses' + .format(len(self.txs), + len(self.hash168s))) await asyncio.sleep(1) except DaemonError as e: self.logger.info('ignoring daemon error: {}'.format(e)) diff --git a/server/version.py b/server/version.py index 8ed7c09..dccaa71 100644 --- a/server/version.py +++ b/server/version.py @@ -1 +1 @@ -VERSION = "ElectrumX 0.9.1" +VERSION = "ElectrumX 0.9.2"