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:
self.config = config
def stop(self):
- print_log( "Stopping Stratum" )
+ print_log("Stopping Stratum")
with self.lock:
self._stopped = True
except:
traceback.print_exc(file=sys.stdout)
- print_log( "processor terminating")
-
+ print_log("processor terminating")
class 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 session is not None:
- is_new = session.protocol_version >= 0.5
if suffix == 'subscribe':
session.subscribe_to_service(method, params)
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)
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:
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:
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:
def contains_subscription(self, subdesc):
with self.lock:
return subdesc in self.subscriptions
-
+
class ResponseDispatcher(threading.Thread):
params = response.get('params')
# A notification
- if internal_id is None: # and method is not None and params is not None:
+ 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':
- params2 = [self.shared.config.get('server','password')] + params
- self.request_dispatcher.push_request(None,{'method':method.replace('.subscribe', '.unsubscribe'), 'params':params2, 'id':None})
+ 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:
+ 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)
if session.contains_subscription(subdesc):
session.send_response(response)
found = True
- # if not found: print_log( "no subscriber for", subdesc)
+ # if not found: print_log("no subscriber for", subdesc)
return found
def send_response(self, internal_id, response):
response['id'] = message_id
session.send_response(response)
#else:
- # print_log( "send_response: no session", message_id, internal_id, response )
-
+ # print_log("send_response: no session", message_id, internal_id, response )
git://git.novaco.in / electrum-server.git / blobdiff