X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=9d2ff84b2a79074a486ce3fcc29ebef4e9b8f865;hb=7621dac937eba5352b245972d027d74c39722d5d;hp=675ef5f650c24b2a5ba434f89d1f0e8b4db622ad;hpb=23de59ae6d8da801586cb2992a76e651fa72c0c4;p=electrum-server.git

diff --git a/server.py b/server.py
index 675ef5f..9d2ff84 100755
--- 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,66 +45,27 @@ try:
 except:
     pass
 
-
 password = config.get('server','password')
+host = config.get('server','host')
+use_libbitcoin = False
 
 
-from processor import Shared, Processor, Dispatcher
-from stratum_http import HttpServer
-from stratum import TcpServer
-from native import NativeServer
-from irc import Irc
-from abe_backend import AbeStore
-
-class AbeProcessor(Processor):
-    def process(self,request):
-        message_id = request['id']
-        method = request['method']
-        params = request.get('params',[])
-        #print request
-
-        result = ''
-        if method == 'numblocks.subscribe':
-            result = store.block_number
-        elif method == 'address.subscribe':
-            address = params[0]
-            store.watch_address(address)
-            status = store.get_status(address)
-            result = status
-        elif method == 'client.version':
-            #session.version = params[0]
-            pass
-        elif method == 'server.banner':
-            result = config.get('server','banner').replace('\\n','\n')
-        elif method == 'server.peers':
-            result = irc.get_peers()
-        elif method == 'address.get_history':
-            address = params[0]
-            result = store.get_history( address ) 
-        elif method == 'transaction.broadcast':
-            txo = store.send_tx(params[0])
-            print "sent tx:", txo
-            result = txo 
-        else:
-            print "unknown method", request
-
-        if result!='':
-            response = { 'id':message_id, 'method':method, 'params':params, 'result':result }
-            self.push_response(response)
-
-    def get_status(self,addr):
-        return store.get_status(addr)
-
-
-
-
+from processor import Dispatcher
+from transports.stratum_http import HttpServer
+from transports.stratum_tcp import TcpServer
+from transports.native import NativeServer
 
+from modules.irc import ServerProcessor
+if use_libbitcoin:
+    from modules.python_bitcoin import LibBitcoinProcessor as BlockchainProcessor
+else:
+    from modules.abe 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)
@@ -116,32 +74,26 @@ if __name__ == '__main__':
         print out
         sys.exit(0)
 
-    processor = AbeProcessor()
-    shared = Shared()
-    # Bind shared to processor since constructor is user defined
-    processor.shared = shared
-    processor.start()
+    # Create hub
+    dispatcher = Dispatcher()
+    shared = dispatcher.shared
 
-    irc = Irc(processor, config.get('server','host'), config.get('server','ircname'))
-    if (config.get('server','irc') == 'yes' ): irc.start()
+    # Create and register processors
+    abe = BlockchainProcessor(config)
+    dispatcher.register('blockchain', abe)
 
-    # backend
-    store = AbeStore(config)
+    sb = ServerProcessor(config)
+    dispatcher.register('server', sb)
 
-    # dispatcher
-    dispatcher = Dispatcher(shared, processor)
-    dispatcher.start()
-
-    host = config.get('server','host')
     # Create various transports we need
-    transports = [ NativeServer(shared, store, 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()
 
     print "starting Electrum server on", host
-    store.run(processor)
+    while not shared.stopped():
+        time.sleep(1)
     print "server stopped"
-