Handle JSON RPC server timeouts differently

Prior method was causing issues on Python 2.7.10 on DragonFlyBSD at
least.
This commit is contained in:
Neil Booth 2015-12-05 21:30:37 +09:00
parent c3bd9226f2
commit 03b4868bf8
1 changed files with 2 additions and 7 deletions

View File

@ -70,7 +70,7 @@ class Daemon(util.DaemonThread):
host = config.get('rpchost', 'localhost')
port = config.get('rpcport', 7777)
self.server = SimpleJSONRPCServer((host, port), requestHandler=RequestHandler, logRequests=False)
self.server.socket.settimeout(1)
self.server.timeout = 1.0
for cmdname in known_commands:
self.server.register_function(getattr(self.cmd_runner, cmdname), cmdname)
self.server.register_function(self.run_cmdline, 'run_cmdline')
@ -149,12 +149,7 @@ class Daemon(util.DaemonThread):
def run(self):
while self.is_running():
try:
self.server.handle_request()
except socket.timeout:
continue
except:
break
self.server.handle_request()
def stop(self):
for k, wallet in self.wallets.items():