From 6f43910f2d42727ea5161935eb57036de4fff669 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sun, 23 Sep 2018 22:19:07 +0100 Subject: [PATCH] Fix daemon logging rate limiter Based on #602 but with test fix --- electrumx/server/daemon.py | 2 +- tests/server/test_daemon.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electrumx/server/daemon.py b/electrumx/server/daemon.py index 506459f..11ccbc7 100644 --- a/electrumx/server/daemon.py +++ b/electrumx/server/daemon.py @@ -116,7 +116,7 @@ class Daemon(object): nonlocal last_error_log, retry now = time.time() if now - last_error_log > 60: - last_error_time = now + last_error_log = now self.logger.error(f'{error} Retrying occasionally...') if retry == self.max_retry and self.failover(): retry = 0 diff --git a/tests/server/test_daemon.py b/tests/server/test_daemon.py index 712e02a..20b5d89 100644 --- a/tests/server/test_daemon.py +++ b/tests/server/test_daemon.py @@ -487,6 +487,6 @@ async def test_failover(daemon, caplog): with ClientSessionFailover(('getblockcount', [], height)): await daemon.height() == height - assert in_caplog(caplog, "disconnected", 3) + assert in_caplog(caplog, "disconnected", 1) assert in_caplog(caplog, "failing over") assert in_caplog(caplog, "connection restored")