AaronFiore/electrum
1
0
Fork 0
Code Activity

Revert "Daemon network cleanup"

Browse Source 
This reverts commit 0a1b3eac9c.
This commit is contained in:
ThomasV
2016-01-29 17:35:19 +01:00
parent 58d5215e2e
commit 2c7b10a776
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum
View File

@@ -328,7 +328,13 @@ 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:
daemon = Daemon(config) if not config.get('offline'):
network = Network(config)
network.start()
else:
network = None
daemon = Daemon(config, network)
daemon.start()
gui = init_gui(config, daemon, plugins) gui = init_gui(config, daemon, plugins)
daemon.gui = gui daemon.gui = gui
gui.main() gui.main()
@@ -345,12 +351,15 @@ if __name__ == '__main__':
elif subcommand == 'start': elif subcommand == 'start':
p = os.fork() p = os.fork()
if p == 0: if p == 0:
daemon = Daemon(config) network = Network(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, daemon.network).start() websockets.WebSocketServer(config, 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.join() daemon.join()
sys.exit(0) sys.exit(0)
else: else:

13
lib/daemon.py
View File

@@ -26,7 +26,7 @@ from wallet import WalletStorage, Wallet
from wizard import WizardBase from wizard import WizardBase
from commands import known_commands, Commands from commands import known_commands, Commands
from simple_config import SimpleConfig from simple_config import SimpleConfig
from network import Network
def lockfile(config): def lockfile(config):
return os.path.join(config.path, 'daemon') return os.path.join(config.path, 'daemon')
@@ -62,16 +62,10 @@ class RequestHandler(SimpleJSONRPCRequestHandler):
class Daemon(DaemonThread): class Daemon(DaemonThread):
def __init__(self, config): def __init__(self, config, network):
DaemonThread.__init__(self) DaemonThread.__init__(self)
self.config = config self.config = config
if not config.get('offline'): self.network = network
self.network = Network(config)
self.network.start()
else:
# FIXME: some of the daemon code assumes self.network is not None
# This is not something this change has introduced
self.network = None
self.gui = None self.gui = None
self.wallets = {} self.wallets = {}
self.wallet = None self.wallet = None
@@ -88,7 +82,6 @@ class Daemon(DaemonThread):
self.server.register_function(self.ping, 'ping') self.server.register_function(self.ping, 'ping')
self.server.register_function(self.run_daemon, 'daemon') self.server.register_function(self.run_daemon, 'daemon')
self.server.register_function(self.run_gui, 'gui') self.server.register_function(self.run_gui, 'gui')
self.start()
def ping(self): def ping(self):
return True return True