X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=baec5d085dd6fa5048a0d1d50cfbbb51f7d83196;hb=9aee581ec251daf4b8086d44c3c2d727cb02bd04;hp=20fdbfd7e26b914c1be6a7157195a46cabe0a11f;hpb=3051f46df11fc6c9ebe321c9ef6d726e65310129;p=electrum-server.git diff --git a/processor.py b/processor.py index 20fdbfd..baec5d0 100644 --- a/processor.py +++ b/processor.py @@ -1,26 +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)) +import traceback +import sys -def timestr(): - return time.strftime("[%d/%m/%Y-%H:%M:%S]") +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 "Stopping Stratum" + print_log("Stopping Stratum") with self.lock: self._stopped = True @@ -35,20 +32,33 @@ class Processor(threading.Thread): threading.Thread.__init__(self) self.daemon = True self.dispatcher = None + self.queue = queue.Queue() def process(self, request): pass + def add_request(self, request): + self.queue.put(request) + def push_response(self, response): #print "response", response self.dispatcher.request_dispatcher.push_response(response) + def run(self): + while not self.shared.stopped(): + request = self.queue.get(10000000000) + try: + self.process(request) + except: + traceback.print_exc(file=sys.stdout) + + 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 = \ @@ -62,7 +72,6 @@ class Dispatcher: self.request_dispatcher.processors[prefix] = processor - class RequestDispatcher(threading.Thread): def __init__(self, shared): @@ -84,7 +93,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() @@ -110,39 +119,55 @@ class RequestDispatcher(threading.Thread): raise TypeError("self.shared not set in Processor") while not self.shared.stopped(): session, request = self.pop_request() - self.process(session, request) + try: + self.do_dispatch(session, request) + except: + traceback.print_exc(file=sys.stdout) self.stop() def stop(self): pass - def process(self, session, request): - method = request['method'] - params = request.get('params',[]) + def do_dispatch(self, session, request): + """ dispatch request to the relevant processor """ + method = request['method'] + params = request.get('params', []) suffix = method.split('.')[-1] - if suffix == 'subscribe': - session.subscribe_to_service(method, params) + + if session is not None: + is_new = session.protocol_version >= 0.5 + if suffix == 'subscribe': + session.subscribe_to_service(method, params) # store session and id locally request['id'] = self.store_session_id(session, request['id']) - # dispatch request to the relevant module.. prefix = request['method'].split('.')[0] try: p = self.processors[prefix] except: - print "error: no processor for", prefix + print_log("error: no processor for", prefix) return - try: - p.process(request) - except: - traceback.print_exc(file=sys.stdout) + + p.add_request(request) if method in ['server.version']: session.version = params[0] + try: + session.protocol_version = float(params[1]) + 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: + r = self.sessions[:] + return r def add_session(self, session): with self.lock: @@ -170,6 +195,7 @@ class Session: self.address = '' self.name = '' self.version = 'unknown' + self.protocol_version = 0. self.time = time.time() threading.Timer(2, self.info).start() @@ -185,8 +211,11 @@ class Session: addr = None if self.subscriptions: - print timestr(), self.name, self.address, addr,\ - 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: @@ -203,7 +232,9 @@ class Session: def build_subdesc(method, params): if method == "blockchain.numblocks.subscribe": return method, - elif method == "blockchain.address.subscribe": + elif method == "blockchain.headers.subscribe": + return method, + elif method in ["blockchain.address.subscribe"]: if not params: return None else: @@ -214,13 +245,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 @@ -229,34 +260,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 "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): 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 "send_response: no session", message_id, internal_id, response - + #else: + # print_log("send_response: no session", message_id, internal_id, response )