X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=5590874450f12258b5812e7439f986b2ed89eef1;hb=2d47ce381274578dfa52c6042bb7e0c433518fbf;hp=8596625e7b92a8d53acaad3186818d48f616e918;hpb=6037a6adcdb140a5a8b291d8d761bee2da320809;p=electrum-server.git

diff --git a/processor.py b/processor.py
index 8596625..5590874 100644
--- a/processor.py
+++ b/processor.py
@@ -13,6 +13,15 @@ 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()
+
+
+
 class Shared:
 
     def __init__(self):
@@ -20,7 +29,7 @@ class Shared:
         self._stopped = False
 
     def stop(self):
-        print "Stopping Stratum"
+        print_log( "Stopping Stratum" )
         with self.lock:
             self._stopped = True
 
@@ -40,6 +49,9 @@ class Processor(threading.Thread):
     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)
@@ -52,7 +64,7 @@ class Processor(threading.Thread):
             except:
                 traceback.print_exc(file=sys.stdout)
 
-        print "processor terminating"
+        print_log( "processor terminating")
             
 
 
@@ -159,10 +171,10 @@ class RequestDispatcher(threading.Thread):
         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]
@@ -171,6 +183,10 @@ 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:
             r = self.sessions[:]
@@ -218,8 +234,7 @@ class Session:
             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:
@@ -270,9 +285,6 @@ class ResponseDispatcher(threading.Thread):
         method = response.get('method')
         params = response.get('params')
 
-        if method == "blockchain.address.subscribe2":
-            method = "blockchain.address.subscribe"
-
         # A notification
         if internal_id is None: # and method is not None and params is not None:
             self.notification(method, params, response)
@@ -280,7 +292,7 @@ class ResponseDispatcher(threading.Thread):
         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)
@@ -288,6 +300,8 @@ class ResponseDispatcher(threading.Thread):
             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):
@@ -296,5 +310,5 @@ class ResponseDispatcher(threading.Thread):
             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 )