From e7e0dd15be6e87226bbdc12f4e860f73b2a83f79 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sun, 13 Nov 2016 15:44:37 +0900 Subject: [PATCH 1/3] Don't log new peers any more --- server/irc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server/irc.py b/server/irc.py index 0f7ec98..a23bd3b 100644 --- a/server/irc.py +++ b/server/irc.py @@ -134,6 +134,5 @@ class IRC(LoggedClass): ip_addr = line[1] peer = self.Peer(ip_addr, line[1], line[2:]) self.peers[nick] = peer - self.logger.info('new {}'.format(peer)) except IndexError: pass From 57dd4ece9ca3e92c4a0740ad1e3537e63de70f4d Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sun, 13 Nov 2016 17:52:08 +0900 Subject: [PATCH 2/3] Avoid annoying exception on shutdown --- lib/jsonrpc.py | 8 ++------ server/protocol.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/jsonrpc.py b/lib/jsonrpc.py index d334d4f..e8e4210 100644 --- a/lib/jsonrpc.py +++ b/lib/jsonrpc.py @@ -79,16 +79,12 @@ class JSONRPC(asyncio.Protocol, LoggedClass): self.send_count = 0 self.send_size = 0 self.error_count = 0 + self.peer_info = None def connection_made(self, transport): '''Handle an incoming client connection.''' self.transport = transport - - def peer_info(self): - '''Return peer info.''' - if self.transport: - return self.transport.get_extra_info('peername') - return None + self.peer_info = transport.get_extra_info('peername') def connection_lost(self, exc): '''Handle client disconnection.''' diff --git a/server/protocol.py b/server/protocol.py index fb55466..e77b045 100644 --- a/server/protocol.py +++ b/server/protocol.py @@ -224,7 +224,7 @@ class Session(JSONRPC): self.manager.add_task(self, self.handle_json_request(request)) def peername(self): - info = self.peer_info() + info = self.peer_info return 'unknown' if not info else '{}:{}'.format(info[0], info[1]) def tx_hash_from_param(self, param): From 41ff6e5b11e0a2e3aa62185d350decae0f3a323d Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sun, 13 Nov 2016 17:55:50 +0900 Subject: [PATCH 3/3] Prepare 0.4.3 --- docs/RELEASE-NOTES | 5 +++++ server/block_processor.py | 4 ++-- server/version.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/RELEASE-NOTES b/docs/RELEASE-NOTES index 6627a61..1ac435c 100644 --- a/docs/RELEASE-NOTES +++ b/docs/RELEASE-NOTES @@ -1,3 +1,8 @@ +version 0.4.3 +------------- + +- fix exception introduced in 0.4.2 + version 0.4.2 ------------- diff --git a/server/block_processor.py b/server/block_processor.py index 28d067c..14d8763 100644 --- a/server/block_processor.py +++ b/server/block_processor.py @@ -84,7 +84,7 @@ class Prefetcher(LoggedClass): async def main_loop(self): '''Loop forever polling for more blocks.''' - self.logger.info('starting daemon poll loop...') + self.logger.info('starting daemon poll loop') while True: try: if await self._caught_up(): @@ -201,7 +201,7 @@ class MemPool(LoggedClass): hex_hashes.difference_update(self.txs) raw_txs = await self.bp.daemon.getrawtransactions(hex_hashes) if initial: - self.logger.info('analysing {:,d} mempool txs...' + self.logger.info('analysing {:,d} mempool txs' .format(len(raw_txs))) new_txs = {hex_hash: Deserializer(raw_tx).read_tx() for hex_hash, raw_tx in zip(hex_hashes, raw_txs) if raw_tx} diff --git a/server/version.py b/server/version.py index 2d25182..bcb5556 100644 --- a/server/version.py +++ b/server/version.py @@ -1 +1 @@ -VERSION = "ElectrumX 0.4.1" +VERSION = "ElectrumX 0.4.3"