X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=0b137338de0526429898c76be835a2f41995be6c;hb=638b04908c8a25b8e40511eb5b5b6c0fce99b99a;hp=2005d8b3da59cacf11f7e4bcfa426a7cf50caf3e;hpb=5ee042c213baa4ae8a0f538de64644ae9abe7b36;p=electrum-server.git

diff --git a/server.py b/server.py
index 2005d8b..0b13733 100755
--- a/server.py
+++ b/server.py
@@ -23,10 +23,12 @@ config = ConfigParser.ConfigParser()
 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')
@@ -48,28 +50,32 @@ except:
 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
 from transports.stratum_tcp import TcpServer
 from transports.native import NativeServer
-from irc import ServerProcessor
-from abe_backend import AbeProcessor
 
+from modules.irc import ServerProcessor
 if use_libbitcoin:
     from modules.python_bitcoin import LibBitcoinProcessor as BlockchainProcessor
 else:
-    from abe_backend import AbeProcessor as BlockchainProcessor
+    from modules.abe import AbeProcessor as BlockchainProcessor
 
 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
@@ -87,10 +93,10 @@ if __name__ == '__main__':
     dispatcher.register('server', sb)
 
     # Create various transports we need
-    transports = [ NativeServer(shared, abe, sb, config.get('server','banner'), host, 50000),
-                   TcpServer(dispatcher, host, 50001),
-                   HttpServer(dispatcher, 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()