X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=processor.py;h=0ad86ff8cd7369c4623c0abd4d71a36cb20a1bd3;hp=5590874450f12258b5812e7439f986b2ed89eef1;hb=f4375ead502d52f5f1e4df8e9b2cc63762326722;hpb=2d47ce381274578dfa52c6042bb7e0c433518fbf diff --git a/processor.py b/processor.py index 5590874..0ad86ff 100644 --- a/processor.py +++ b/processor.py @@ -1,35 +1,23 @@ import json +import Queue as queue import socket import threading import time -import traceback, sys -import Queue as queue - -def random_string(N): - import random, string - return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N)) - -def timestr(): - return time.strftime("[%d/%m/%Y-%H:%M:%S]") - - -print_lock = threading.Lock() -def print_log(*args): - args = [str(item) for item in args] - with print_lock: - sys.stderr.write(timestr() + " " + " ".join(args) + "\n") - sys.stderr.flush() +import traceback +import sys +from utils import random_string, timestr, print_log class Shared: - def __init__(self): + def __init__(self, config): self.lock = threading.Lock() self._stopped = False + self.config = config def stop(self): - print_log( "Stopping Stratum" ) + print_log("Stopping Stratum") with self.lock: self._stopped = True @@ -64,14 +52,13 @@ class Processor(threading.Thread): except: traceback.print_exc(file=sys.stdout) - print_log( "processor terminating") - + print_log("processor terminating") class Dispatcher: - def __init__(self): - self.shared = Shared() + def __init__(self, config): + self.shared = Shared(config) self.request_dispatcher = RequestDispatcher(self.shared) self.request_dispatcher.start() self.response_dispatcher = \ @@ -85,7 +72,6 @@ class Dispatcher: self.request_dispatcher.processors[prefix] = processor - class RequestDispatcher(threading.Thread): def __init__(self, shared): @@ -97,6 +83,7 @@ class RequestDispatcher(threading.Thread): self.internal_ids = {} self.internal_id = 1 self.lock = threading.Lock() + self.idlock = threading.Lock() self.sessions = [] self.processors = {} @@ -107,7 +94,7 @@ class RequestDispatcher(threading.Thread): return self.response_queue.get() def push_request(self, session, item): - self.request_queue.put((session,item)) + self.request_queue.put((session, item)) def pop_request(self): return self.request_queue.get() @@ -118,11 +105,11 @@ class RequestDispatcher(threading.Thread): return x def get_session_id(self, internal_id): - with self.lock: + with self.idlock: return self.internal_ids.pop(internal_id) def store_session_id(self, session, msgid): - with self.lock: + with self.idlock: self.internal_ids[self.internal_id] = session, msgid r = self.internal_id self.internal_id += 1 @@ -137,7 +124,6 @@ class RequestDispatcher(threading.Thread): self.do_dispatch(session, request) except: traceback.print_exc(file=sys.stdout) - self.stop() @@ -148,21 +134,12 @@ class RequestDispatcher(threading.Thread): """ dispatch request to the relevant processor """ method = request['method'] - params = request.get('params',[]) + params = request.get('params', []) suffix = method.split('.')[-1] - is_new = session.protocol_version >= 0.5 - - if is_new and method == 'blockchain.address.get_history': - method = 'blockchain.address.get_history2' - request['method'] = method - - if suffix == 'subscribe': - if is_new and method == 'blockchain.address.subscribe': - method = 'blockchain.address.subscribe2' - request['method'] = method - - session.subscribe_to_service(method, params) + if session is not None: + if suffix == 'subscribe': + session.subscribe_to_service(method, params) # store session and id locally request['id'] = self.store_session_id(session, request['id']) @@ -171,7 +148,7 @@ class RequestDispatcher(threading.Thread): try: p = self.processors[prefix] except: - print_log( "error: no processor for", prefix) + print_log("error: no processor for", prefix) return p.add_request(request) @@ -183,9 +160,6 @@ class RequestDispatcher(threading.Thread): except: pass - #if session.protocol_version < 0.6: - # print_log("stopping session from old client", session.protocol_version) - # session.stop() def get_sessions(self): with self.lock: @@ -198,15 +172,26 @@ class RequestDispatcher(threading.Thread): def collect_garbage(self): # Deep copy entire sessions list and blank it - # This is done to minimise lock contention + # This is done to minimize lock contention with self.lock: sessions = self.sessions[:] - self.sessions = [] + + active_sessions = [] + + now = time.time() + for session in sessions: + if (now - session.time) > 1000: + session.stop() + for session in sessions: if not session.stopped(): # If session is still alive then re-add it back # to our internal register - self.add_session(session) + active_sessions.append(session) + + with self.lock: + self.sessions = active_sessions[:] + class Session: @@ -234,7 +219,11 @@ class Session: addr = None if self.subscriptions: - print_log( "%4s"%self.name, "%14s"%self.address, "%35s"%addr, "%3d"%len(self.subscriptions), self.version ) + print_log("%4s" % self.name, + "%15s" % self.address, + "%35s" % addr, + "%3d" % len(self.subscriptions), + self.version) def stopped(self): with self.lock: @@ -253,7 +242,7 @@ class Session: return method, elif method == "blockchain.headers.subscribe": return method, - elif method in ["blockchain.address.subscribe", "blockchain.address.subscribe2"]: + elif method in ["blockchain.address.subscribe"]: if not params: return None else: @@ -264,13 +253,13 @@ class Session: def contains_subscription(self, subdesc): with self.lock: return subdesc in self.subscriptions - + class ResponseDispatcher(threading.Thread): - def __init__(self, shared, processor): + def __init__(self, shared, request_dispatcher): self.shared = shared - self.processor = processor + self.request_dispatcher = request_dispatcher threading.Thread.__init__(self) self.daemon = True @@ -279,36 +268,45 @@ class ResponseDispatcher(threading.Thread): self.update() def update(self): - response = self.processor.pop_response() + response = self.request_dispatcher.pop_response() #print "pop response", response internal_id = response.get('id') method = response.get('method') params = response.get('params') # A notification - if internal_id is None: # and method is not None and params is not None: - self.notification(method, params, response) + if internal_id is None: # and method is not None and params is not None: + found = self.notification(method, params, response) + if not found and method == 'blockchain.address.subscribe': + request = { + 'id': None, + 'method': method.replace('.subscribe', '.unsubscribe'), + 'params': [self.shared.config.get('server', 'password')] + params, + } + + self.request_dispatcher.push_request(None, request) # A response - elif internal_id is not None: # and method is None and params is None: + elif internal_id is not None: self.send_response(internal_id, response) else: - print_log( "no method", response) + print_log("no method", response) def notification(self, method, params, response): subdesc = Session.build_subdesc(method, params) - for session in self.processor.sessions: + found = False + for session in self.request_dispatcher.sessions: if session.stopped(): continue if session.contains_subscription(subdesc): - if response.get('method') == "blockchain.address.subscribe2": - response['method'] = "blockchain.address.subscribe" session.send_response(response) + found = True + # if not found: print_log("no subscriber for", subdesc) + return found def send_response(self, internal_id, response): - session, message_id = self.processor.get_session_id(internal_id) + session, message_id = self.request_dispatcher.get_session_id(internal_id) if session: response['id'] = message_id session.send_response(response) - else: - print_log( "send_response: no session", message_id, internal_id, response ) - + #else: + # print_log("send_response: no session", message_id, internal_id, response )