RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lightning: polish timeouts on 1080 conn

Browse Source
This commit is contained in:
Janus 2018-02-21 15:29:31 +01:00
parent f219af81be
commit 559d12e3a3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/lightning.py
View File

@ -683,8 +683,6 @@ class LightningUI():
return lightningCall(self.rpc(), nam) return lightningCall(self.rpc(), nam)
privateKeyHash = None 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): class LightningWorker(ForeverCoroutineJob):
def __init__(self, wallet, network, config): 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) reader, writer = await asyncio.wait_for(asyncio.open_connection(machine, 1080), 5)
writer.write(b"MAGIC") writer.write(b"MAGIC")
writer.write(privateKeyHash[:6]) writer.write(privateKeyHash[:6])
await writer.drain() await asyncio.wait_for(writer.drain(), 5)
while is_running(): while is_running():
obj = await readJson(reader, is_running) obj = await readJson(reader, is_running)
if not obj: continue if not obj: continue
await readReqAndReply(obj, writer) await asyncio.wait_for(readReqAndReply(obj, writer), 10)
except: except:
traceback.print_exc() traceback.print_exc()
await asyncio.sleep(5)
continue continue
async def readJson(reader, is_running): async def readJson(reader, is_running):