AaronFiore/electrum
1
0
Fork 0
Code Activity

Revert "Revert "Daemon network cleanup""

Browse Source 
This reverts commit 2c7b10a776.
This commit is contained in:
ThomasV
2016-01-30 11:13:11 +01:00
parent 012f500976
commit 5e6a55edd5
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum
View File

@@ -328,13 +328,7 @@ 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()
daemon = Daemon(config)
gui = init_gui(config, daemon, plugins)
daemon.gui = gui
gui.main()
@@ -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: