X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=c3cb6fbbbba20f7724df6e5e38f90bb353300e26;hb=bf4424854236c3d46ab18a890601b4bad1f74c73;hp=6ada775c4968f6e3f63044f8c366c097bd1d5fd0;hpb=f7e00a67fa936e9c63c465d5ad7bfd7fb4eaa664;p=electrum-server.git

diff --git a/server.py b/server.py
index 6ada775..c3cb6fb 100755
--- a/server.py
+++ b/server.py
@@ -38,10 +38,15 @@ def create_config():
     config.add_section('server')
     config.set('server', 'banner', 'Welcome to Electrum!')
     config.set('server', 'host', 'localhost')
+    config.set('server', 'report_host', '')
     config.set('server', 'stratum_tcp_port', '50001')
     config.set('server', 'stratum_http_port', '8081')
     config.set('server', 'stratum_tcp_ssl_port', '50002')
     config.set('server', 'stratum_http_ssl_port', '8082')
+    config.set('server', 'report_stratum_tcp_port', '')
+    config.set('server', 'report_stratum_http_port', '')
+    config.set('server', 'report_stratum_tcp_ssl_port', '')
+    config.set('server', 'report_stratum_http_ssl_port', '')
     config.set('server', 'password', '')
     config.set('server', 'irc', 'yes')
     config.set('server', 'irc_nick', '')
@@ -114,7 +119,7 @@ if __name__ == '__main__':
         run_rpc_command(sys.argv[1], stratum_tcp_port)
         sys.exit(0)
 
-    from processor import Dispatcher
+    from processor import Dispatcher, print_log
     from backends.irc import ServerProcessor
 
     backend_name = config.get('server', 'backend')
@@ -122,16 +127,17 @@ if __name__ == '__main__':
         from backends.abe import BlockchainProcessor
     elif backend_name == 'libbitcoin':
         from backends.libbitcoin import BlockchainProcessor
-    elif backend_name == 'bitcoind':
+    elif backend_name == 'leveldb':
         from backends.bitcoind import BlockchainProcessor
     else:
         print "Unknown backend '%s' specified\n" % backend_name
         sys.exit(1)
 
-    print "\n\n\n\nStarting Electrum server on", host
+    for i in range(5): print ""
+    print_log( "Starting Electrum server on", host)
 
     # Create hub
-    dispatcher = Dispatcher()
+    dispatcher = Dispatcher(config)
     shared = dispatcher.shared
 
     # Create and register processors
@@ -172,5 +178,5 @@ if __name__ == '__main__':
         except:
             shared.stop()
 
-    print "Electrum Server stopped"
+    print_log( "Electrum Server stopped")