LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-01 01:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats 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) lockfile = Daemon.lockfile(config)
fd = Daemon.get_fd_or_server(lockfile) fd = Daemon.get_fd_or_server(lockfile)
if isinstance(fd, int): if isinstance(fd, int):
daemon = Daemon.create_daemon(config, fd) daemon = Daemon(config, fd)
daemon.start()
daemon.init_gui(config, plugins) daemon.init_gui(config, plugins)
sys.exit(0) sys.exit(0)
server = fd else:
result = server.gui(config_options) server = fd
result = server.gui(config_options)
elif cmdname == 'daemon': elif cmdname == 'daemon':
lockfile = Daemon.lockfile(config) lockfile = Daemon.lockfile(config)
@ -337,7 +339,8 @@ if __name__ == '__main__':
if pid: if pid:
print_stderr("starting daemon (PID %d)" % pid) print_stderr("starting daemon (PID %d)" % pid)
sys.exit(0) sys.exit(0)
daemon = Daemon.create_daemon(config, fd) daemon = Daemon(config, fd)
daemon.start()
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, daemon.network).start()

24
lib/daemon.py
View file

@ -48,7 +48,8 @@ class RequestHandler(SimpleJSONRPCRequestHandler):
class Daemon(DaemonThread): class Daemon(DaemonThread):
def __init__(self, config, server): def __init__(self, config, fd):
DaemonThread.__init__(self) DaemonThread.__init__(self)
self.config = config self.config = config
if config.get('offline'): if config.get('offline'):
@ -58,9 +59,14 @@ class Daemon(DaemonThread):
self.network.start() self.network.start()
self.gui = None self.gui = None
self.wallets = {} self.wallets = {}
self.server = server
# Setup server # Setup server
cmd_runner = Commands(self.config, None, self.network) cmd_runner = Commands(self.config, None, self.network)
host = config.get('rpchost', 'localhost')
port = config.get('rpcport', 0)
server = SimpleJSONRPCServer((host, port), logRequests=False,
requestHandler=RequestHandler)
os.write(fd, repr((server.socket.getsockname(), time.time())))
os.close(fd)
server.timeout = 0.1 server.timeout = 0.1
for cmdname in known_commands: for cmdname in known_commands:
server.register_function(getattr(cmd_runner, cmdname), cmdname) server.register_function(getattr(cmd_runner, cmdname), cmdname)
@ -68,6 +74,7 @@ class Daemon(DaemonThread):
server.register_function(self.ping, 'ping') server.register_function(self.ping, 'ping')
server.register_function(self.run_daemon, 'daemon') server.register_function(self.run_daemon, 'daemon')
server.register_function(self.run_gui, 'gui') server.register_function(self.run_gui, 'gui')
self.server = server
def ping(self): def ping(self):
return True return True
@ -221,16 +228,3 @@ class Daemon(DaemonThread):
# Sleep a bit and try again; it might have just been started # Sleep a bit and try again; it might have just been started
time.sleep(1.0) time.sleep(1.0)
@staticmethod
def create_daemon(config, fd):
'''Create a daemon and server when they don't exist.'''
host = config.get('rpchost', 'localhost')
port = config.get('rpcport', 0)
server = SimpleJSONRPCServer((host, port), logRequests=False,
requestHandler=RequestHandler)
os.write(fd, repr((server.socket.getsockname(), time.time())))
os.close(fd)
daemon = Daemon(config, server)
daemon.start()
return daemon