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

daemon: call self.start in __init__, and allow not to listen on jsonrpc

Browse source
This commit is contained in:
SomberNight 2018-10-01 17:56:51 +02:00
parent 4653a1007c
commit 7dd4032cce
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
electrum/daemon.py
View file

@ -121,10 +121,10 @@ def get_rpc_credentials(config):
class Daemon(DaemonThread):
def __init__(self, config, fd=None):
def __init__(self, config, fd=None, *, listen_jsonrpc=True):
DaemonThread.__init__(self)
self.config = config
if fd is None:
if fd is None and listen_jsonrpc:
fd, server = get_fd_or_server(config)
if fd is None: raise Exception('failed to lock daemon; already running?')
if config.get('offline'):
@ -137,7 +137,10 @@ class Daemon(DaemonThread):
self.gui = None
self.wallets = {} # type: Dict[str, Abstract_Wallet]
# Setup JSONRPC server
self.server = None
if listen_jsonrpc:
self.init_server(config, fd)
self.start()
def init_server(self, config, fd):
host = config.get('rpchost', '127.0.0.1')

2
run_electrum
View file

@ -416,7 +416,6 @@ if __name__ == '__main__':
if fd is not None:
plugins = init_plugins(config, config.get('gui', 'qt'))
d = daemon.Daemon(config, fd)
d.start()
d.init_gui(config, plugins)
sys.exit(0)
else:
@ -437,7 +436,6 @@ if __name__ == '__main__':
sys.exit(0)
init_plugins(config, 'cmdline')
d = daemon.Daemon(config, fd)
d.start()
if config.get('websocket_server'):
from electrum import websockets
websockets.WebSocketServer(config, d.network).start()