AaronFiore/electrum
1
0
Fork 0
Code Activity

remove another unnecessary static method

Browse Source
This commit is contained in:
ThomasV
2016-02-01 09:25:57 +01:00
parent 1c83c3e060
commit 3b00f62d46
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
electrum
View File

@@ -316,11 +316,13 @@ if __name__ == '__main__':
lockfile = Daemon.lockfile(config)
fd = Daemon.get_fd_or_server(lockfile)
if isinstance(fd, int):
daemon = Daemon.create_daemon(config, fd)
daemon = Daemon(config, fd)
daemon.start()
daemon.init_gui(config, plugins)
sys.exit(0)
server = fd
result = server.gui(config_options)
else:
server = fd
result = server.gui(config_options)
elif cmdname == 'daemon':
lockfile = Daemon.lockfile(config)
@@ -337,7 +339,8 @@ if __name__ == '__main__':
if pid:
print_stderr("starting daemon (PID %d)" % pid)
sys.exit(0)
daemon = Daemon.create_daemon(config, fd)
daemon = Daemon(config, fd)
daemon.start()
if config.get('websocket_server'):
from electrum import websockets
websockets.WebSocketServer(config, daemon.network).start()