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 0bd7e63..c3cb6fb 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -15,12 +15,16 @@
 # 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
 logging.basicConfig()
 
+if sys.maxsize <= 2**32:
+    print "Warning: it looks like you are using a 32bit system. You may experience crashes caused by mmap"
+
+
 def attempt_read_config(config, filename):
     try:
         with open(filename, 'r') as f:
@@ -34,15 +38,24 @@ 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', '')
+    config.set('server', 'coin', '')
+    config.set('server', 'datadir', '')
     config.add_section('database')
     config.set('database', 'type', 'psycopg2')
     config.set('database', 'database', 'abe')
-    config.set('database', 'limit', '500')
+    config.set('database', 'limit', '1000')
     config.set('server', 'backend', 'abe')
 
     for path in ('/etc/', ''):
@@ -59,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')
@@ -90,36 +108,42 @@ if __name__ == '__main__':
     host = config.get('server', 'host')
     stratum_tcp_port = config.get('server', 'stratum_tcp_port')
     stratum_http_port = config.get('server', 'stratum_http_port')
+    stratum_tcp_ssl_port = config.get('server', 'stratum_tcp_ssl_port')
+    stratum_http_ssl_port = config.get('server', 'stratum_http_ssl_port')
+    ssl_certfile = config.get('server', 'ssl_certfile')
+    ssl_keyfile = config.get('server', 'ssl_keyfile')
+
+    if stratum_tcp_ssl_port or stratum_http_ssl_port: assert ssl_certfile and ssl_keyfile 
 
     if len(sys.argv) > 1:
         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
-    chain_proc = backend.BlockchainProcessor(config)
+    chain_proc = BlockchainProcessor(config, shared)
     dispatcher.register('blockchain', chain_proc)
 
-    # catch_up first
-    n = chain_proc.store.main_iteration()
-    print "blockchain: %d blocks"%n
-
     server_proc = ServerProcessor(config)
     dispatcher.register('server', server_proc)
 
@@ -127,18 +151,32 @@ if __name__ == '__main__':
     # Create various transports we need
     if stratum_tcp_port:
         from transports.stratum_tcp import TcpServer
-        tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_port))
+        tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_port), False, None, None)
+        transports.append(tcp_server)
+
+    if stratum_tcp_ssl_port:
+        from transports.stratum_tcp import TcpServer
+        tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_ssl_port), True, ssl_certfile, ssl_keyfile)
         transports.append(tcp_server)
 
     if stratum_http_port:
         from transports.stratum_http import HttpServer
-        http_server = HttpServer(dispatcher, host, int(stratum_http_port))
+        http_server = HttpServer(dispatcher, host, int(stratum_http_port), False, None, None)
+        transports.append(http_server)
+
+    if stratum_http_ssl_port:
+        from transports.stratum_http import HttpServer
+        http_server = HttpServer(dispatcher, host, int(stratum_http_ssl_port), True, ssl_certfile, ssl_keyfile)
         transports.append(http_server)
 
     for server in transports:
         server.start()
 
     while not shared.stopped():
-        time.sleep(1)
-    print "Server stopped"
+        try:
+            time.sleep(1)
+        except:
+            shared.stop()
+
+    print_log( "Electrum Server stopped")