X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=20fdbfd7e26b914c1be6a7157195a46cabe0a11f;hb=3051f46df11fc6c9ebe321c9ef6d726e65310129;hp=b2308b608a2ede450153168ca9fdfd4bade85225;hpb=fc3d15cda642cbb7ab01ea21a70ba8deb75ea32d;p=electrum-server.git

diff --git a/processor.py b/processor.py
index b2308b6..20fdbfd 100644
--- a/processor.py
+++ b/processor.py
@@ -89,6 +89,11 @@ class RequestDispatcher(threading.Thread):
     def pop_request(self):
         return self.request_queue.get()
 
+    def get_session_by_address(self, address):
+        for x in self.sessions:
+            if x.address == address:
+                return x
+
     def get_session_id(self, internal_id):
         with self.lock:
             return self.internal_ids.pop(internal_id)
@@ -164,6 +169,8 @@ class Session:
         self.subscriptions = []
         self.address = ''
         self.name = ''
+        self.version = 'unknown'
+        self.time = time.time()
         threading.Timer(2, self.info).start()
 
     # Debugging method. Doesn't need to be threadsafe.
@@ -172,13 +179,14 @@ class Session:
             #print sub
             method = sub[0]
             if method == 'blockchain.address.subscribe':
-                params = sub[1]
-                addr = params[0]
+                addr = sub[1]
                 break
         else:
             addr = None
-        print timestr(), self.name, self.address, addr,\
-            len(self.subscriptions), self.version
+
+        if self.subscriptions:
+            print timestr(), self.name, self.address, addr,\
+                len(self.subscriptions), self.version
 
     def stopped(self):
         with self.lock:
@@ -246,6 +254,9 @@ class ResponseDispatcher(threading.Thread):
 
     def send_response(self, internal_id, response):
         session, message_id = self.processor.get_session_id(internal_id)
-        response['id'] = message_id
-        session.send_response(response)
+        if session:
+            response['id'] = message_id
+            session.send_response(response)
+        else:
+            print "send_response: no session", message_id, internal_id, response