tfix daemon timeout - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 35a12b22cf735c1e37e06c4e918c018fe92c77c1
DIR parent a63eaa3c4eae7f5ad1a0e284b5aa8269567ee5f7
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 18 Aug 2014 15:35:29 +0200
fix daemon timeout
Diffstat:
M lib/daemon.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/lib/daemon.py b/lib/daemon.py
t@@ -91,8 +91,8 @@ class ClientThread(threading.Thread):
threading.Thread(target=self.reading_thread).start()
while self.running:
try:
- response = self.response_queue.get()
- except util.timeout:
+ response = self.response_queue.get(timeout=0.1)
+ except Queue.Empty:
continue
try:
self.client_pipe.send(response)
t@@ -142,12 +142,12 @@ class NetworkServer(threading.Thread):
client.response_queue.put({'method':'network.status', 'params':[key, value]})
with self.lock:
self.clients.append(client)
+ print_error("new client:", len(self.clients))
def remove_client(self, client):
with self.lock:
self.clients.remove(client)
- print_error("client quit:", len(self.clients))
-
+ print_error("client quit:", len(self.clients))
def send_request(self, client, request):
with self.lock: