create dispatcher class; redefine processors as threads

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 9ee8dc8..2005d8b 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -15,11 +15,8 @@
 # License along with this program.  If not, see
 # <http://www.gnu.org/licenses/agpl.html>.
 
-import time, json, socket, operator, thread, ast, sys, re, traceback
+import time, sys, traceback
 import ConfigParser
-from json import dumps, loads
-import urllib
-import threading
 
 config = ConfigParser.ConfigParser()
 # set some defaults, which will be overwritten by the config file
@@ -48,32 +45,28 @@ try:
 except:
     pass
 
-
 password = config.get('server','password')
+host = config.get('server','host')
+use_libbitcoin = False
 
 
-from processor import Shared, Processor, Dispatcher
-
-
+from processor import Dispatcher
 from transports.stratum_http import HttpServer
 from transports.stratum_tcp import TcpServer
 from transports.native import NativeServer
+from irc import ServerProcessor
+from abe_backend import AbeProcessor
 
-
-import irc 
-import abe_backend 
-from processor import Processor
-
-
-
-
-
+if use_libbitcoin:
+    from modules.python_bitcoin import LibBitcoinProcessor as BlockchainProcessor
+else:
+    from abe_backend import AbeProcessor as BlockchainProcessor
 
 if __name__ == '__main__':
 
     if len(sys.argv)>1:
         import jsonrpclib
-        server = jsonrpclib.Server('http://%s:8081'%config.get('server','host'))
+        server = jsonrpclib.Server('http://%s:8081'%host)
         cmd = sys.argv[1]
         if cmd == 'stop':
             out = server.stop(password)
@@ -82,27 +75,21 @@ if __name__ == '__main__':
         print out
         sys.exit(0)
 
-    processor = Processor()
-    shared = Shared()
-    # Bind shared to processor since constructor is user defined
-    processor.shared = shared
-    processor.start()
+    # Create hub
+    dispatcher = Dispatcher()
+    shared = dispatcher.shared
 
-    abe = abe_backend.AbeBackend(config, processor)
-    processor.register('blockchain', abe.process)
+    # Create and register processors
+    abe = BlockchainProcessor(config)
+    dispatcher.register('blockchain', abe)
 
-    sb = irc.ServerBackend(config, processor)
-    processor.register('server', sb.process)
-
-    # dispatcher
-    dispatcher = Dispatcher(shared, processor)
-    dispatcher.start()
+    sb = ServerProcessor(config)
+    dispatcher.register('server', sb)
 
     # Create various transports we need
-    host = config.get('server','host')
-    transports = [ NativeServer(shared, abe.store, sb.irc, config.get('server','banner'), host, 50000),
-                   TcpServer(shared, processor, host, 50001),
-                   HttpServer(shared, processor, host, 8081),
+    transports = [ NativeServer(shared, abe, sb, config.get('server','banner'), host, 50000),
+                   TcpServer(dispatcher, host, 50001),
+                   HttpServer(dispatcher, host, 8081),
                    ]
     for server in transports:
         server.start()
@@ -111,4 +98,3 @@ if __name__ == '__main__':
     while not shared.stopped():
         time.sleep(1)
     print "server stopped"
-