AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #7396 from MrNaif2018/fix/jsonrpc-lockfile-cleanup

Browse Source 
Don't cleanup lockfile if listen_jsonrpc is False
This commit is contained in:
ghost43
2021-07-12 18:12:09 +02:00
committed by GitHub
parent b7cc5f329c c35a46a727
commit ee391a4932
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/daemon.py
View File

@@ -414,6 +414,7 @@ class Daemon(Logger):
def __init__(self, config: SimpleConfig, fd=None, *, listen_jsonrpc=True): def __init__(self, config: SimpleConfig, fd=None, *, listen_jsonrpc=True):
Logger.__init__(self) Logger.__init__(self)
self.config = config self.config = config
self.listen_jsonrpc = listen_jsonrpc
if fd is None and listen_jsonrpc: if fd is None and listen_jsonrpc:
fd = get_file_descriptor(config) fd = get_file_descriptor(config)
if fd is None: if fd is None:
@@ -567,8 +568,9 @@ class Daemon(Logger):
fut = asyncio.run_coroutine_threadsafe(stop_async(), self.asyncio_loop) fut = asyncio.run_coroutine_threadsafe(stop_async(), self.asyncio_loop)
fut.result() fut.result()
finally: finally:
self.logger.info("removing lockfile") if self.listen_jsonrpc:
remove_lockfile(get_lockfile(self.config)) self.logger.info("removing lockfile")
remove_lockfile(get_lockfile(self.config))
self.logger.info("stopped") self.logger.info("stopped")
self.asyncio_loop.call_soon_threadsafe(self.stopped_event.set) self.asyncio_loop.call_soon_threadsafe(self.stopped_event.set)