daemon: create network inside constructor
This commit is contained in:
parent
7c7722439b
commit
f6f7113978
13
electrum
13
electrum
|
@ -328,12 +328,7 @@ if __name__ == '__main__':
|
||||||
if server is not None:
|
if server is not None:
|
||||||
result = server.gui(config_options)
|
result = server.gui(config_options)
|
||||||
else:
|
else:
|
||||||
if not config.get('offline'):
|
daemon = Daemon(config)
|
||||||
network = Network(config)
|
|
||||||
network.start()
|
|
||||||
else:
|
|
||||||
network = None
|
|
||||||
daemon = Daemon(config, network)
|
|
||||||
daemon.start()
|
daemon.start()
|
||||||
gui = init_gui(config, daemon, plugins)
|
gui = init_gui(config, daemon, plugins)
|
||||||
daemon.gui = gui
|
daemon.gui = gui
|
||||||
|
@ -351,12 +346,10 @@ if __name__ == '__main__':
|
||||||
elif subcommand == 'start':
|
elif subcommand == 'start':
|
||||||
p = os.fork()
|
p = os.fork()
|
||||||
if p == 0:
|
if p == 0:
|
||||||
network = Network(config)
|
daemon = Daemon(config)
|
||||||
network.start()
|
|
||||||
daemon = Daemon(config, network)
|
|
||||||
if config.get('websocket_server'):
|
if config.get('websocket_server'):
|
||||||
from electrum import websockets
|
from electrum import websockets
|
||||||
websockets.WebSocketServer(config, network).start()
|
websockets.WebSocketServer(config, daemon.network).start()
|
||||||
if config.get('requests_dir'):
|
if config.get('requests_dir'):
|
||||||
util.check_www_dir(config.get('requests_dir'))
|
util.check_www_dir(config.get('requests_dir'))
|
||||||
daemon.start()
|
daemon.start()
|
||||||
|
|
|
@ -21,6 +21,7 @@ import ast, os
|
||||||
import jsonrpclib
|
import jsonrpclib
|
||||||
from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
|
from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
|
||||||
|
|
||||||
|
from network import Network
|
||||||
from util import json_decode, DaemonThread
|
from util import json_decode, DaemonThread
|
||||||
from wallet import WalletStorage, Wallet
|
from wallet import WalletStorage, Wallet
|
||||||
from wizard import WizardBase
|
from wizard import WizardBase
|
||||||
|
@ -62,10 +63,14 @@ class RequestHandler(SimpleJSONRPCRequestHandler):
|
||||||
|
|
||||||
class Daemon(DaemonThread):
|
class Daemon(DaemonThread):
|
||||||
|
|
||||||
def __init__(self, config, network):
|
def __init__(self, config):
|
||||||
DaemonThread.__init__(self)
|
DaemonThread.__init__(self)
|
||||||
self.config = config
|
self.config = config
|
||||||
self.network = network
|
if config.get('offline'):
|
||||||
|
self.network = None
|
||||||
|
else:
|
||||||
|
self.network = Network(config)
|
||||||
|
self.network.start()
|
||||||
self.gui = None
|
self.gui = None
|
||||||
self.wallets = {}
|
self.wallets = {}
|
||||||
self.wallet = None
|
self.wallet = None
|
||||||
|
|
Loading…
Reference in New Issue