LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

lightning: less junk on console, quicker shutdown

Browse source
This commit is contained in:
Janus 2018-03-15 18:43:10 +01:00 • committed by SomberNight
parent e184b613e9
commit c3aa6e30cd
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrum/gui/qt/main_window.py
View file

@ -1965,7 +1965,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
'wallet': self.wallet, 'wallet': self.wallet,
'network': self.network, 'network': self.network,
'plugins': self.gui_object.plugins, 'plugins': self.gui_object.plugins,
'lightning': self.gui_object.lightning, 'l': self.gui_object.lightning,
'window': self, 'window': self,
'config': self.config, 'config': self.config,
'electrum': electrum, 'electrum': electrum,

9
lib/lightning.py
View file

@ -598,7 +598,7 @@ class LightningRPC:
self.subscribers = [] self.subscribers = []
# overridden # overridden
async def run(self, netAndWalLock): async def run(self, netAndWalLock):
while True: while asyncio.get_event_loop().is_running():
try: try:
qitem = self.queue.get(block=False) qitem = self.queue.get(block=False)
except queue.Empty: except queue.Empty:
@ -681,7 +681,7 @@ class LightningWorker:
wasAlreadyUpToDate = False wasAlreadyUpToDate = False
while True: while asyncio.get_event_loop().is_running():
WALLET = self.wallet() WALLET = self.wallet()
NETWORK = self.network() NETWORK = self.network()
CONFIG = self.config() CONFIG = self.config()
@ -704,7 +704,7 @@ class LightningWorker:
writer.write(b"MAGIC") writer.write(b"MAGIC")
writer.write(privateKeyHash[:6]) writer.write(privateKeyHash[:6])
await asyncio.wait_for(writer.drain(), 5) await asyncio.wait_for(writer.drain(), 5)
while True: while asyncio.get_event_loop().is_running():
obj = await readJson(reader) obj = await readJson(reader)
if not obj: continue if not obj: continue
if "id" not in obj: if "id" not in obj:
@ -721,13 +721,12 @@ class LightningWorker:
async def readJson(reader): async def readJson(reader):
data = b"" data = b""
while True: while asyncio.get_event_loop().is_running():
newlines = sum(1 if x == b"\n"[0] else 0 for x in data) newlines = sum(1 if x == b"\n"[0] else 0 for x in data)
if newlines > 1: print("Too many newlines in Electrum/lightning.py!", data) if newlines > 1: print("Too many newlines in Electrum/lightning.py!", data)
try: try:
return json.loads(data) return json.loads(data)
except ValueError: except ValueError:
if data != b"": print("parse failed, data has", data)
try: try:
data += await asyncio.wait_for(reader.read(1), 1) data += await asyncio.wait_for(reader.read(1), 1)
except TimeoutError: except TimeoutError: