X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=4c51af5379e304d27f70d8dfb6a5102998bac6a7;hb=ff99a48192b6a39b3ee301c8836eb11b283f7c1a;hp=8b67e499d09cabb959bc535de79a2d821b1fd98a;hpb=65383ca074c7ee02311df11d57ca42061177558e;p=electrum-server.git

diff --git a/server.py b/server.py
index 8b67e49..4c51af5 100755
--- a/server.py
+++ b/server.py
@@ -32,30 +32,27 @@ config.set('server', 'irc_nick', '')
 config.add_section('database')
 config.set('database', 'type', 'psycopg2')
 config.set('database', 'database', 'abe')
+config.set('server', 'backend', '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 IOError:
+        print "Could not read %s. Falling back." % filename
 
 try:
-    f = open('/etc/electrum.banner','r')
-    config.set('server','banner', f.read())
-    f.close()
-except:
+    with open('/etc/electrum.banner', 'r') as f:
+        config.set('server','banner', f.read())
+except IOError:
     pass
 
 password = config.get('server','password')
 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
@@ -63,19 +60,24 @@ 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:
+backend_name = config.get('server', 'backend')
+if backend_name == "libbitcoin":
+    # NativeServer cannot be used with libbitcoin
+    native_port = None
+    from modules.python_bitcoin import BlockchainProcessor
+elif backend_name == "abe":
     from modules.abe import AbeProcessor as BlockchainProcessor
+else:
+    raise Exception('Unknown backend specified')
 
 if __name__ == '__main__':
 
     if len(sys.argv)>1:
         import jsonrpclib
-        server = jsonrpclib.Server('http://%s:8081'%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
@@ -96,7 +98,7 @@ if __name__ == '__main__':
     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), password) )
+    if stratum_http_port: transports.append( HttpServer(dispatcher, host, int(stratum_http_port)) )
     for server in transports:
         server.start()