X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=6946a40a3807d2da454e4316c2a2bc62e8f3eeb9;hb=82588a08467eada0fd7e41ecfdfed9f1fde93ce5;hp=97a9773542cb60cd32d0bac65ea1889dca2ca948;hpb=cb1ebe091b58cb616458c1afd1b97251d61eabed;p=electrum-server.git

diff --git a/server.py b/server.py
index 97a9773..6946a40 100755
--- a/server.py
+++ b/server.py
@@ -15,93 +15,89 @@
 # 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
 config.add_section('server')
 config.set('server','banner', 'Welcome to Electrum!')
 config.set('server', 'host', 'localhost')
-config.set('server', 'port', '50000')
+config.set('server', 'native_port', '50000')
+config.set('server', 'stratum_tcp_port', '50001')
+config.set('server', 'stratum_http_port', '8081')
 config.set('server', 'password', '')
 config.set('server', 'irc', 'yes')
-config.set('server', 'ircname', 'Electrum server')
+config.set('server', 'irc_nick', '')
 config.add_section('database')
 config.set('database', 'type', 'psycopg2')
 config.set('database', 'database', 'abe')
 
-try:
-    f = open('/etc/electrum.conf','r')
-    config.readfp(f)
-    f.close()
-except:
-    print "Could not read electrum.conf. I will use the default values."
+for path in ('', '/etc/'):
+    filename = path + 'electrum.conf'
+    try:
+        with open(filename, 'r') as f:
+            config.readfp(f)
+    except:
+        print "Could not read %s. Falling back." % filename
 
 try:
-    f = open('/etc/electrum.banner','r')
-    config.set('server','banner', f.read())
-    f.close()
+    with open('/etc/electrum.banner', 'r') as f:
+        config.set('server','banner', f.read())
 except:
     pass
 
-
 password = config.get('server','password')
-
-
-from processor import Shared, Processor, Dispatcher
-from stratum_http import HttpServer
-from stratum import TcpServer
-from native import NativeServer
-
-
-import irc 
-import abe_backend 
-from processor import Processor
-
-
-
-
-
+host = config.get('server','host')
+use_libbitcoin = False
+native_port = config.get('server','native_port')
+stratum_tcp_port = config.get('server','stratum_tcp_port')
+stratum_http_port = config.get('server','stratum_http_port')
+# NativeServer cannot be used with libbitcoin
+if use_libbitcoin: native_port = None
+
+
+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:%s'%(host,stratum_http_port))
         cmd = sys.argv[1]
         if cmd == 'stop':
-            out = server.stop(password)
+            out = server.server.stop(password)
         else:
             out = "Unknown command: '%s'" % cmd
         print out
         sys.exit(0)
 
-    processor = Processor()
-    shared = Shared()
-    # Bind shared to processor since constructor is user defined
-    processor.shared = shared
-    processor.start()
-
-    abe = abe_backend.AbeBackend(config, processor)
-    processor.register('blockchain', abe.process)
+    # Create hub
+    dispatcher = Dispatcher()
+    shared = dispatcher.shared
 
-    sb = irc.ServerBackend(config, processor)
-    processor.register('server', sb.process)
+    # Create and register processors
+    abe = BlockchainProcessor(config)
+    dispatcher.register('blockchain', abe)
 
-    # 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 = []
+    if native_port: transports.append( NativeServer(shared, abe, sb, config.get('server','banner'), host, int(native_port)) )
+    if stratum_tcp_port: transports.append( TcpServer(dispatcher, host, int(stratum_tcp_port)) )
+    if stratum_http_port: transports.append( HttpServer(dispatcher, host, int(stratum_http_port)) )
     for server in transports:
         server.start()
 
@@ -109,4 +105,3 @@ if __name__ == '__main__':
     while not shared.stopped():
         time.sleep(1)
     print "server stopped"
-