electrum

Electrum Bitcoin wallet
git clone https://git.parazyd.org/electrum
Log | Files | Refs | Submodules

commit e8bc5bbec4e3664eafa851924f645bd2f8bc67d6
parent cd52350f5df1e650107a5ff2faa5336278606cfe
Author: SomberNight <somber.night@protonmail.com>
Date:   Wed, 15 May 2019 19:56:16 +0200

interface: follow-up 6cc70bc7a216afd129d24992029dcbd8e9dc861b

Diffstat:
Melectrum/interface.py | 30++++++++++++++++++++----------
Melectrum/synchronizer.py | 11+++++++++--
2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/electrum/interface.py b/electrum/interface.py @@ -32,10 +32,12 @@ from typing import Tuple, Union, List, TYPE_CHECKING, Optional from collections import defaultdict from ipaddress import IPv4Network, IPv6Network, ip_address import itertools +import logging import aiorpcx from aiorpcx import RPCSession, Notification, NetAddress from aiorpcx.curio import timeout_after, TaskTimeout +from aiorpcx.jsonrpc import JSONRPC import certifi from .util import ignore_exceptions, log_exceptions, bfh, SilentTaskGroup @@ -148,7 +150,13 @@ class NotificationSession(RPCSession): self.interface.logger.debug(msg) -class GracefulDisconnect(Exception): pass +class GracefulDisconnect(Exception): + log_level = logging.INFO + + def __init__(self, *args, log_level=None, **kwargs): + Exception.__init__(self, *args, **kwargs) + if log_level is not None: + self.log_level = log_level class RequestTimedOut(GracefulDisconnect): @@ -305,9 +313,7 @@ class Interface(Logger): try: return await func(self, *args, **kwargs) except GracefulDisconnect as e: - self.logger.info(f"disconnecting gracefully. {repr(e)}") - except aiorpcx.jsonrpc.RPCError as e: - self.logger.error(f"disconnecting due to {repr(e)}") + self.logger.log(e.log_level, f"disconnecting due to {repr(e)}") finally: await self.network.connection_down(self) self.got_disconnected.set_result(1) @@ -428,17 +434,21 @@ class Interface(Logger): f'in bucket {self.bucket_based_on_ipaddress()}') self.logger.info(f"connection established. version: {ver}") - async with self.group as group: - await group.spawn(self.ping) - await group.spawn(self.run_fetch_blocks) - await group.spawn(self.monitor_connection) - # NOTE: group.__aexit__ will be called here; this is needed to notice exceptions in the group! + try: + async with self.group as group: + await group.spawn(self.ping) + await group.spawn(self.run_fetch_blocks) + await group.spawn(self.monitor_connection) + except aiorpcx.jsonrpc.RPCError as e: + if e.code in (JSONRPC.EXCESSIVE_RESOURCE_USAGE, JSONRPC.SERVER_BUSY): + raise GracefulDisconnect(e, log_level=logging.ERROR) from e + raise async def monitor_connection(self): while True: await asyncio.sleep(1) if not self.session or self.session.is_closing(): - raise GracefulDisconnect('server closed session') + raise GracefulDisconnect('session was closed') async def ping(self): while True: diff --git a/electrum/synchronizer.py b/electrum/synchronizer.py @@ -26,14 +26,16 @@ import asyncio import hashlib from typing import Dict, List, TYPE_CHECKING, Tuple from collections import defaultdict +import logging -from aiorpcx import TaskGroup, run_in_thread +from aiorpcx import TaskGroup, run_in_thread, RPCError from .transaction import Transaction from .util import bh2u, make_aiohttp_session, NetworkJobOnDefaultServer from .bitcoin import address_to_scripthash, is_address from .network import UntrustedServerReturnedError from .logging import Logger +from .interface import GracefulDisconnect if TYPE_CHECKING: from .network import Network @@ -103,7 +105,12 @@ class SynchronizerBase(NetworkJobOnDefaultServer): h = address_to_scripthash(addr) self.scripthash_to_address[h] = addr self._requests_sent += 1 - await self.session.subscribe('blockchain.scripthash.subscribe', [h], self.status_queue) + try: + await self.session.subscribe('blockchain.scripthash.subscribe', [h], self.status_queue) + except RPCError as e: + if e.message == 'history too large': # no unique error code + raise GracefulDisconnect(e, log_level=logging.ERROR) from e + raise self._requests_answered += 1 self.requested_addrs.remove(addr)