AaronFiore/electrum
1
0
Fork 0
Code Activity

commands: make stop() CLI cmd wait for daemon to stop

Browse Source
This commit is contained in:
SomberNight
2021-03-17 19:16:07 +01:00
parent 8870ed7cc5
commit 5dfe1d1b6c
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/commands.py
View File

@@ -209,7 +209,8 @@ class Commands:
@command('n') @command('n')
async def stop(self): async def stop(self):
"""Stop daemon""" """Stop daemon"""
self.daemon.stop() # TODO it would be nice if this could stop the GUI too
await self.daemon.stop()
return "Daemon stopped" return "Daemon stopped"
@command('n') @command('n')

44
electrum/daemon.py
View File

@@ -455,6 +455,7 @@ class Daemon(Logger):
if self.config.get('use_gossip', False): if self.config.get('use_gossip', False):
self.network.start_gossip() self.network.start_gossip()
self.stopped_event = asyncio.Event()
self.taskgroup = TaskGroup() self.taskgroup = TaskGroup()
asyncio.run_coroutine_threadsafe(self._run(jobs=daemon_jobs), self.asyncio_loop) asyncio.run_coroutine_threadsafe(self._run(jobs=daemon_jobs), self.asyncio_loop)
@@ -542,33 +543,36 @@ class Daemon(Logger):
with self.running_lock: with self.running_lock:
return self.running and not self.taskgroup.closed() return self.running and not self.taskgroup.closed()
def stop(self): async def stop(self):
with self.running_lock: with self.running_lock:
self.running = False self.running = False
await self.stopped_event.wait()
def on_stop(self): def on_stop(self):
self.logger.info("on_stop() entered. initiating shutdown") try:
if self.gui_object: self.logger.info("on_stop() entered. initiating shutdown")
self.gui_object.stop() if self.gui_object:
self.gui_object.stop()
@log_exceptions async def stop_async():
async def stop_async(): self.logger.info("stopping all wallets")
self.logger.info("stopping all wallets")
async with TaskGroup() as group:
for k, wallet in self._wallets.items():
await group.spawn(wallet.stop())
self.logger.info("stopping network and taskgroup")
async with ignore_after(2):
async with TaskGroup() as group: async with TaskGroup() as group:
if self.network: for k, wallet in self._wallets.items():
await group.spawn(self.network.stop(full_shutdown=True)) await group.spawn(wallet.stop())
await group.spawn(self.taskgroup.cancel_remaining()) self.logger.info("stopping network and taskgroup")
async with ignore_after(2):
async with TaskGroup() as group:
if self.network:
await group.spawn(self.network.stop(full_shutdown=True))
await group.spawn(self.taskgroup.cancel_remaining())
fut = asyncio.run_coroutine_threadsafe(stop_async(), self.asyncio_loop) fut = asyncio.run_coroutine_threadsafe(stop_async(), self.asyncio_loop)
fut.result() fut.result()
self.logger.info("removing lockfile") finally:
remove_lockfile(get_lockfile(self.config)) self.logger.info("removing lockfile")
self.logger.info("stopped") remove_lockfile(get_lockfile(self.config))
self.logger.info("stopped")
self.asyncio_loop.call_soon_threadsafe(self.stopped_event.set)
def run_gui(self, config, plugins): def run_gui(self, config, plugins):
threading.current_thread().setName('GUI') threading.current_thread().setName('GUI')