AaronFiore/electrum
1
0
Fork 0
Code Activity

daemon: simplify get_fd_or_server

Browse Source
This commit is contained in:
ThomasV
2019-08-15 09:58:23 +02:00
parent a9239bd40f
commit b81feb6550
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
run_electrum
View File

@@ -357,13 +357,14 @@ if __name__ == '__main__':
if cmdname == 'gui':
configure_logging(config)
fd, server = daemon.get_fd_or_server(config)
fd = daemon.get_file_descriptor(config)
if fd is not None:
plugins = init_plugins(config, config.get('gui', 'qt'))
d = daemon.Daemon(config, fd)
d.init_gui(config, plugins)
sys.exit(0)
else:
server = daemon.get_server()
result = server.gui(config_options)
elif cmdname == 'daemon':
@@ -373,7 +374,7 @@ if __name__ == '__main__':
if subcommand in [None, 'start']:
configure_logging(config)
fd, server = daemon.get_fd_or_server(config)
fd = daemon.get_file_descriptor(config)
if fd is not None:
if subcommand == 'start':
pid = os.fork()
@@ -404,6 +405,7 @@ if __name__ == '__main__':
d.join()
sys.exit(0)
else:
server = daemon.get_server(config)
result = server.daemon(config_options)
else:
server = daemon.get_server(config)