AaronFiore/electrum
1
0
Fork 0
Code Activity

Daemon network cleanup

Browse Source 
All Daemon creation was preceded by Network creation, based on
config, and passing it to Daemon.
As config is passed to Daemon, it might as well create its own
network and the code is in one place.
This commit is contained in:
Neil Booth
2016-01-29 21:51:46 +09:00
parent 3b44504644
commit 0a1b3eac9c
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
electrum
View File

@@ -328,14 +328,8 @@ if __name__ == '__main__':
if server is not None:
result = server.gui(config_options)
else:
if not config.get('offline'):
network = Network(config)
network.start()
else:
network = None
daemon = Daemon(config, network)
daemon.start()
gui = init_gui(config, network, daemon, plugins)
daemon = Daemon(config)
gui = init_gui(config, daemon.network, daemon, plugins)
daemon.gui = gui
gui.main()
sys.exit(0)
@@ -351,15 +345,12 @@ if __name__ == '__main__':
elif subcommand == 'start':
p = os.fork()
if p == 0:
network = Network(config)
network.start()
daemon = Daemon(config, network)
daemon = Daemon(config)
if config.get('websocket_server'):
from electrum import websockets
websockets.WebSocketServer(config, network).start()
websockets.WebSocketServer(config, daemon.network).start()
if config.get('requests_dir'):
util.check_www_dir(config.get('requests_dir'))
daemon.start()
daemon.join()
sys.exit(0)
else: