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()
+
+
+
class Shared:
def __init__(self):
self._stopped = False
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")
params = request.get('params',[])
suffix = method.split('.')[-1]
- try:
- is_new = float(session.version) >= 1.3
- except:
- is_new = False
+ is_new = session.protocol_version >= 0.5
if is_new and method == 'blockchain.address.get_history':
method = 'blockchain.address.get_history2'
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
+
+ #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:
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, "%14s"%self.address, "%35s"%addr, "%3d"%len(self.subscriptions), self.version )
def stopped(self):
with self.lock:
elif internal_id is not None: # and method is None and params is 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)
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)
def send_response(self, internal_id, response):
response['id'] = message_id
session.send_response(response)
else:
- print "send_response: no session", message_id, internal_id, response
+ print_log( "send_response: no session", message_id, internal_id, response )