improved logging

[electrum-server.git] / processor.py

diff --git a/processor.py b/processor.py
index a18594d..84af962 100644 (file)
--- a/processor.py
+++ b/processor.py
@@ -5,6 +5,14 @@ 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]")
+
+
 class Shared:
 
     def __init__(self):
@@ -24,7 +32,39 @@ class Shared:
 class Processor(threading.Thread):
 
     def __init__(self):
-        self.shared = None
+        threading.Thread.__init__(self)
+        self.daemon = True
+        self.dispatcher = None
+
+    def process(self, request):
+        pass
+
+    def push_response(self, response):
+        self.dispatcher.request_dispatcher.push_response(response)
+
+
+
+class Dispatcher:
+
+    def __init__(self):
+        self.shared = Shared()
+        self.request_dispatcher = RequestDispatcher(self.shared)
+        self.request_dispatcher.start()
+        self.response_dispatcher = ResponseDispatcher(self.shared, self.request_dispatcher)
+        self.response_dispatcher.start()
+
+    def register(self, prefix, processor):
+        processor.dispatcher = self
+        processor.shared = self.shared
+        processor.start()
+        self.request_dispatcher.processors[prefix] = processor
+
+
+
+class RequestDispatcher(threading.Thread):
+
+    def __init__(self, shared):
+        self.shared = shared
         threading.Thread.__init__(self)
         self.daemon = True
         self.request_queue = queue.Queue()
@@ -58,9 +98,6 @@ class Processor(threading.Thread):
             self.internal_id += 1
             return r
 
-    def register(self, prefix, function):
-        self.processors[prefix] = function
-
     def run(self):
         if self.shared is None:
             raise TypeError("self.shared not set in Processor")
@@ -87,15 +124,18 @@ class Processor(threading.Thread):
         # dispatch request to the relevant module..
         prefix = request['method'].split('.')[0]
         try:
-            func = self.processors[prefix]
+            p = self.processors[prefix]
         except:
             print "error: no processor for", prefix
             return
         try:
-            func(request,self.response_queue)
+            p.process(request)
         except:
             traceback.print_exc(file=sys.stdout)
 
+        if method in ['server.version']:
+            session.version = params[0]
+
 
     def add_session(self, session):
         with self.lock:
@@ -120,6 +160,19 @@ class Session:
         self._stopped = False
         self.lock = threading.Lock()
         self.subscriptions = []
+        self.address = ''
+        self.name = ''
+        threading.Timer(2, self.info).start()
+
+    def info(self):
+        for s in self.subscriptions:
+            m, p = s
+            if m == 'blockchain.address.subscribe':
+                addr = p[0]
+                break
+        else:
+            addr = None
+        print timestr(), self.name, self.address, addr, len(self.subscriptions), self.version
 
     def stopped(self):
         with self.lock:
@@ -130,7 +183,7 @@ class Session:
             self.subscriptions.append((method, params))
     
 
-class Dispatcher(threading.Thread):
+class ResponseDispatcher(threading.Thread):
 
     def __init__(self, shared, processor):
         self.shared = shared