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
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)
except:
traceback.print_exc(file=sys.stdout)
- print "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 = \
self.request_dispatcher.processors[prefix] = processor
-
class RequestDispatcher(threading.Thread):
def __init__(self, shared):
self.internal_ids = {}
self.internal_id = 1
self.lock = threading.Lock()
+ self.idlock = threading.Lock()
self.sessions = []
self.processors = {}
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()
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
self.do_dispatch(session, request)
except:
traceback.print_exc(file=sys.stdout)
-
self.stop()
""" dispatch request to the relevant processor """
method = request['method']
- params = request.get('params',[])
+ params = request.get('params', [])
suffix = method.split('.')[-1]
- if suffix == 'subscribe':
- 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'])
try:
p = self.processors[prefix]
except:
- print "error: no processor for", prefix
+ print_log("error: no processor for", prefix)
return
- p.queue.put(request)
+ p.add_request(request)
if method in ['server.version']:
session.version = params[0]
+ try:
+ session.protocol_version = float(params[1])
+ except:
+ pass
+
def get_sessions(self):
with self.lock:
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:
self.address = ''
self.name = ''
self.version = 'unknown'
+ self.protocol_version = 0.
self.time = time.time()
threading.Timer(2, self.info).start()
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:
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:
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
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 )
git://git.novaco.in / electrum-server.git / blobdiff