AaronFiore/electrum
1
0
Fork 0
Code Activity

trustedcoin: longer timeout for server signing

Browse Source 
fixes #5221
This commit is contained in:
SomberNight
2019-03-25 23:36:52 +01:00
parent 9b0773cf2b
commit 1cfac928f9
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/network.py
View File

@@ -1159,7 +1159,9 @@ class Network(PrintError):
await asyncio.sleep(0.1)
@classmethod
async def _send_http_on_proxy(cls, method: str, url: str, params: str = None, body: bytes = None, json: dict = None, headers=None, on_finish=None):
async def _send_http_on_proxy(cls, method: str, url: str, params: str = None,
body: bytes = None, json: dict = None, headers=None,
on_finish=None, timeout=None):
async def default_on_finish(resp: ClientResponse):
resp.raise_for_status()
return await resp.text()
@@ -1169,7 +1171,7 @@ class Network(PrintError):
on_finish = default_on_finish
network = cls.get_instance()
proxy = network.proxy if network else None
async with make_aiohttp_session(proxy) as session:
async with make_aiohttp_session(proxy, timeout=timeout) as session:
if method == 'get':
async with session.get(url, params=params, headers=headers) as resp:
return await on_finish(resp)
@@ -1193,7 +1195,8 @@ class Network(PrintError):
else:
loop = asyncio.get_event_loop()
coro = asyncio.run_coroutine_threadsafe(cls._send_http_on_proxy(method, url, **kwargs), loop)
return coro.result(5)
# note: _send_http_on_proxy has its own timeout, so no timeout here:
return coro.result()
# methods used in scripts
async def get_peers(self):