AaronFiore/electrum
1
0
Fork 0
Code Activity

move static methods away from daemon class; restore initial logic

Browse Source
This commit is contained in:
ThomasV
2016-02-01 10:20:22 +01:00
parent 3b00f62d46
commit 690c862923
2 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
electrum
View File

@@ -74,7 +74,7 @@ from electrum.util import print_msg, print_stderr, json_encode, json_decode
from electrum.util import set_verbosity, InvalidPassword
from electrum.plugins import Plugins
from electrum.commands import get_parser, known_commands, Commands, config_variables
from electrum.daemon import Daemon
from electrum import daemon
# get password routine
@@ -313,48 +313,49 @@ if __name__ == '__main__':
sys.exit(0)
if cmdname == 'gui':
lockfile = Daemon.lockfile(config)
fd = Daemon.get_fd_or_server(lockfile)
fd = daemon.get_fd_or_server(config)
if isinstance(fd, int):
daemon = Daemon(config, fd)
daemon.start()
daemon.init_gui(config, plugins)
d = daemon.Daemon(config, fd)
d.start()
d.init_gui(config, plugins)
sys.exit(0)
else:
server = fd
result = server.gui(config_options)
elif cmdname == 'daemon':
lockfile = Daemon.lockfile(config)
fd = Daemon.get_fd_or_server(lockfile)
if isinstance(fd, int):
subcommand = config.get('subcommand')
assert subcommand in ['start', 'stop', 'status']
if subcommand != 'start':
print_msg("Daemon not running")
os.close(fd)
Daemon.remove_lockfile(lockfile)
sys.exit(1)
pid = os.fork()
if pid:
print_stderr("starting daemon (PID %d)" % pid)
subcommand = config.get('subcommand')
assert subcommand in ['start', 'stop', 'status']
if subcommand == 'start':
fd = daemon.get_fd_or_server(config)
if isinstance(fd, int):
pid = os.fork()
if pid:
print_stderr("starting daemon (PID %d)" % pid)
sys.exit(0)
d = daemon.Daemon(config, fd)
d.start()
if config.get('websocket_server'):
from electrum import websockets
websockets.WebSocketServer(config, d.network).start()
if config.get('requests_dir'):
util.check_www_dir(config.get('requests_dir'))
d.join()
sys.exit(0)
daemon = Daemon(config, fd)
daemon.start()
if config.get('websocket_server'):
from electrum import websockets
websockets.WebSocketServer(config, daemon.network).start()
if config.get('requests_dir'):
util.check_www_dir(config.get('requests_dir'))
daemon.join()
sys.exit(0)
else:
server = fd
result = server.daemon(config_options)
else:
server = fd
result = server.daemon(config_options)
server = daemon.get_server(config)
if server is not None:
result = server.daemon(config_options)
else:
print_msg("Daemon not running")
sys.exit(1)
else:
# command line
init_cmdline(config_options)
server = Daemon.get_server(Daemon.lockfile(config))
server = daemon.get_server(config)
if server is not None:
result = server.run_cmdline(config_options)
else: