LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid string representation issues

Browse source 
Caused by unicode vs non-unicode strings.
Fixes #1338
This commit is contained in:
Neil Booth 2015-07-03 13:49:50 +09:00
parent 306756b42d
commit 3a50c78a47
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/daemon.py
View file

@ -24,6 +24,7 @@ import threading
import traceback import traceback
import json import json
import Queue import Queue
from collections import defaultdict
import util import util
from network import Network from network import Network
@ -73,7 +74,7 @@ class ClientThread(util.DaemonThread):
self.client_pipe = util.SocketPipe(s) self.client_pipe = util.SocketPipe(s)
self.response_queue = Queue.Queue() self.response_queue = Queue.Queue()
self.server.add_client(self) self.server.add_client(self)
self.subscriptions = set() self.subscriptions = defaultdict(list)
def reading_thread(self): def reading_thread(self):
while self.is_running(): while self.is_running():
@ -90,7 +91,7 @@ class ClientThread(util.DaemonThread):
self.server.stop() self.server.stop()
continue continue
if method[-10:] == '.subscribe': if method[-10:] == '.subscribe':
self.subscriptions.add(repr((method, params))) self.subscriptions[method].append(params)
self.server.send_request(self, request) self.server.send_request(self, request)
def run(self): def run(self):
@ -167,7 +168,7 @@ class NetworkServer(util.DaemonThread):
m = response.get('method') m = response.get('method')
v = response.get('params') v = response.get('params')
for client in self.clients: for client in self.clients:
if repr((m, v)) in client.subscriptions or m == 'network.status': if m == 'network.status' or v in client.subscriptions.get(m, []):
client.response_queue.put(response) client.response_queue.put(response)
self.network.stop() self.network.stop()
print_error("server exiting") print_error("server exiting")