From 7496b511b82b6e467ec74531ff2bfe42fa0ed1fc Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 12 Nov 2016 09:25:34 +0900 Subject: [PATCH 1/3] Fix silly thinko --- server/daemon.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/server/daemon.py b/server/daemon.py index 0fa7dec..b85f8fe 100644 --- a/server/daemon.py +++ b/server/daemon.py @@ -49,18 +49,18 @@ class Daemon(util.LoggedClass): Handles temporary connection issues. Daemon reponse errors are raise through DaemonError. ''' - prior_msg = None - skip_count = None + self.prior_msg = None + self.skip_count = None def log_error(msg, skip_once=False): - if skip_once and skip_count is None: - skip_count = 1 - if msg != prior_msg or skip_count == 0: - skip_count = 10 - prior_msg = msg + if skip_once and self.skip_count is None: + self.skip_count = 1 + if msg != self.prior_msg or self.skip_count == 0: + self.skip_count = 10 + self.prior_msg = msg self.logger.error('{}. Retrying between sleeps...' .format(msg)) - skip_count -= 1 + self.skip_count -= 1 data = json.dumps(payload) secs = 1 @@ -69,7 +69,7 @@ class Daemon(util.LoggedClass): async with self.workqueue_semaphore: async with aiohttp.post(self.url, data=data) as resp: result = processor(await resp.json()) - if prior_msg: + if self.prior_msg: self.logger.info('connection restored') return result except asyncio.TimeoutError: From 59b2b2cb045f417348ed8d1fee032050efcff924 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 12 Nov 2016 09:26:40 +0900 Subject: [PATCH 2/3] Better log formatting --- server/daemon.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/daemon.py b/server/daemon.py index b85f8fe..1dae4cd 100644 --- a/server/daemon.py +++ b/server/daemon.py @@ -58,7 +58,7 @@ class Daemon(util.LoggedClass): if msg != self.prior_msg or self.skip_count == 0: self.skip_count = 10 self.prior_msg = msg - self.logger.error('{}. Retrying between sleeps...' + self.logger.error('{} Retrying between sleeps...' .format(msg)) self.skip_count -= 1 @@ -73,19 +73,19 @@ class Daemon(util.LoggedClass): self.logger.info('connection restored') return result except asyncio.TimeoutError: - log_error('timeout error', skip_once=True) + log_error('timeout error.', skip_once=True) except aiohttp.ClientHttpProcessingError: - log_error('HTTP error', skip_once=True) + log_error('HTTP error.', skip_once=True) except aiohttp.ServerDisconnectedError: - log_error('disconnected', skip_once=True) + log_error('disconnected.', skip_once=True) except aiohttp.ClientConnectionError: log_error('connection problem - is your daemon running?') except self.DaemonWarmingUpError: - log_error('still starting up checking blocks...') + log_error('still starting up checking blocks.') except (asyncio.CancelledError, DaemonError): raise except Exception as e: - log_error('request gave unexpected error: {}'.format(e)) + log_error('request gave unexpected error: {}.'.format(e)) await asyncio.sleep(secs) secs = min(16, secs * 2) From 419ab68a38138ee075605b830a5362eac5cc0007 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 12 Nov 2016 09:27:46 +0900 Subject: [PATCH 3/3] Prepare 0.3.2 --- docs/RELEASE-NOTES | 5 +++++ server/version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/RELEASE-NOTES b/docs/RELEASE-NOTES index c9cd5b9..5d5139d 100644 --- a/docs/RELEASE-NOTES +++ b/docs/RELEASE-NOTES @@ -1,3 +1,8 @@ +Version 0.3.2 +------------- + +- fixed silly bug in 0.3.1 + Version 0.3.1 ------------- diff --git a/server/version.py b/server/version.py index 6e1d57d..44f15ac 100644 --- a/server/version.py +++ b/server/version.py @@ -1 +1 @@ -VERSION = "ElectrumX 0.3.1" +VERSION = "ElectrumX 0.3.2"