From 559d12e3a36541ea0fae0ffb637123205e273b98 Mon Sep 17 00:00:00 2001 From: Janus Date: Wed, 21 Feb 2018 15:29:31 +0100 Subject: [PATCH] lightning: polish timeouts on 1080 conn --- lib/lightning.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/lightning.py b/lib/lightning.py index d1fa2035..0c711102 100644 --- a/lib/lightning.py +++ b/lib/lightning.py @@ -683,8 +683,6 @@ class LightningUI(): return lightningCall(self.rpc(), nam) privateKeyHash = None -ip = lambda: "{}.{}.{}.{}".format(privateKeyHash[0], privateKeyHash[1], privateKeyHash[2], privateKeyHash[3]) -port = lambda: int.from_bytes(privateKeyHash[4:6], "big") class LightningWorker(ForeverCoroutineJob): def __init__(self, wallet, network, config): @@ -735,13 +733,14 @@ class LightningWorker(ForeverCoroutineJob): reader, writer = await asyncio.wait_for(asyncio.open_connection(machine, 1080), 5) writer.write(b"MAGIC") writer.write(privateKeyHash[:6]) - await writer.drain() + await asyncio.wait_for(writer.drain(), 5) while is_running(): obj = await readJson(reader, is_running) if not obj: continue - await readReqAndReply(obj, writer) + await asyncio.wait_for(readReqAndReply(obj, writer), 10) except: traceback.print_exc() + await asyncio.sleep(5) continue async def readJson(reader, is_running):