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

diff --git a/server.py b/server.py
index bfbeecd..6ada775 100755
--- 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
@@ -40,6 +40,8 @@ def create_config():
     config.set('server', 'host', 'localhost')
     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', 'password', '')
     config.set('server', 'irc', 'yes')
     config.set('server', 'irc_nick', '')
@@ -65,8 +67,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')
@@ -96,30 +103,39 @@ 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 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 == 'bitcoind':
+        from backends.bitcoind import BlockchainProcessor
+    else:
+        print "Unknown backend '%s' specified\n" % backend_name
+        sys.exit(1)
 
-    print "Starting Electrum server on", host
+    print "\n\n\n\nStarting Electrum server on", host
 
     # Create hub
     dispatcher = Dispatcher()
     shared = dispatcher.shared
 
     # Create and register processors
-    chain_proc = backend.BlockchainProcessor(config)
+    chain_proc = BlockchainProcessor(config, shared)
     dispatcher.register('blockchain', chain_proc)
 
     server_proc = ServerProcessor(config)
@@ -129,18 +145,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 "Electrum Server stopped"