adding report_ config fields for different host and port settings on IRC for NAT...

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 517299e..c3cb6fb 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -15,7 +15,7 @@
 # License along with this program.  If not, see
 # <http://www.gnu.org/licenses/agpl.html>.
 
-import time, sys, traceback
+import time, sys, traceback, threading
 import ConfigParser
 
 import logging
@@ -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', '')
@@ -67,8 +72,13 @@ def create_config():
 
 def run_rpc_command(command, stratum_tcp_port):
     import socket, json
-    s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
-    s.connect(( host, int(stratum_tcp_port )))
+    try:
+        s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
+        s.connect(( host, int(stratum_tcp_port )))
+    except:
+        print "cannot connect to server."
+        return
+
     method = 'server.' + command
     request = json.dumps( { 'id':0, 'method':method, 'params':[password] } )
     s.send(request + '\n')
@@ -109,30 +119,29 @@ 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')
-    try:
-        backend = __import__("backends." + backend_name,
-                             fromlist=["BlockchainProcessor"])
-    except ImportError:
-        sys.stderr.write("Unknown backend '%s' specified\n" % backend_name)
-        raise
+    if backend_name == 'abe':
+        from backends.abe import BlockchainProcessor
+    elif backend_name == 'libbitcoin':
+        from backends.libbitcoin import BlockchainProcessor
+    elif backend_name == 'leveldb':
+        from backends.bitcoind import BlockchainProcessor
+    else:
+        print "Unknown backend '%s' specified\n" % backend_name
+        sys.exit(1)
 
-    print "Starting 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
-
-    # from backends.bitcoind import Blockchain2Processor
-    # chain2_proc = Blockchain2Processor(config)
-    # dispatcher.register('blockchain2', chain2_proc)
-
-    chain_proc = backend.BlockchainProcessor(config)
+    chain_proc = BlockchainProcessor(config, shared)
     dispatcher.register('blockchain', chain_proc)
 
     server_proc = ServerProcessor(config)
@@ -164,6 +173,10 @@ if __name__ == '__main__':
         server.start()
 
     while not shared.stopped():
-        time.sleep(1)
-    print "Server stopped"
+        try:
+            time.sleep(1)
+        except:
+            shared.stop()
+
+    print_log( "Electrum Server stopped")