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

lightning: less junk on console, quicker shutdown

Browse Source
This commit is contained in:
Janus 2018-03-15 18:43:10 +01:00
parent 155f62f7d4
commit f5e3da3e56
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/main_window.py
View File

@ -1914,7 +1914,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
console.updateNamespace({'wallet' : self.wallet, console.updateNamespace({'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})
console.updateNamespace({'util' : util, 'bitcoin':bitcoin}) console.updateNamespace({'util' : util, 'bitcoin':bitcoin})

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:

8
lib/network.py
View File

@ -1052,9 +1052,11 @@ class Network(util.DaemonThread):
networkAndWalletLock.release() networkAndWalletLock.release()
networkAndWalletLock.acquire() networkAndWalletLock.acquire()
loop.stop() loop.stop()
while loop.is_running(): if loop.is_running(): time.sleep(0.1)
pass try:
loop.close() loop.close()
except:
pass
self.stop_network() self.stop_network()
self.on_stop() self.on_stop()