add timeout for http sessions

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index f0b2b41..5846fba 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -18,6 +18,9 @@
 import time, sys, traceback
 import ConfigParser
 
+import logging
+logging.basicConfig()
+
 def attempt_read_config(config, filename):
     try:
         with open(filename, 'r') as f:
@@ -29,9 +32,8 @@ def create_config():
     config = ConfigParser.ConfigParser()
     # set some defaults, which will be overwritten by the config file
     config.add_section('server')
-    config.set('server','banner', 'Welcome to Electrum!')
+    config.set('server', 'banner', 'Welcome to Electrum!')
     config.set('server', 'host', 'localhost')
-    config.set('server', 'native_port', '50000')
     config.set('server', 'stratum_tcp_port', '50001')
     config.set('server', 'stratum_http_port', '8081')
     config.set('server', 'password', '')
@@ -54,44 +56,47 @@ def create_config():
 
     return config
 
-def run_rpc_command(command, stratum_http_port):
-    import jsonrpclib
-    server = jsonrpclib.Server('http://%s:%s'%(host, stratum_http_port))
-    if command == 'stop':
-        result = server.server.stop(password)
-    else:
-        result = "Unknown command: '%s'" % command
-    print result
+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 )))
+    method = 'server.' + command
+    request = json.dumps( { 'id':0, 'method':method, 'params':[password] } )
+    s.send(request + '\n')
+    msg = ''
+    while True:
+        o = s.recv(1024)
+        msg += o
+        if msg.find('\n') != -1: break
+    s.close()
+    r = json.loads(msg).get('result')
+    if command == 'stop': print r
+    elif command == 'info': 
+        now = time.time()
+        for item in r:
+            print '%15s   %3s  %7s  %.2f'%( item.get('address'), item.get('subscriptions'), item.get('version'), (now - item.get('time')) )
 
 if __name__ == '__main__':
     config = create_config()
     password = config.get('server', 'password')
     host = config.get('server', 'host')
-    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')
 
     if len(sys.argv) > 1:
-        run_rpc_command(sys.argv[1], stratum_http_port)
+        run_rpc_command(sys.argv[1], stratum_tcp_port)
         sys.exit(0)
 
     from processor import Dispatcher
-    from transports.stratum_http import HttpServer
-    from transports.stratum_tcp import TcpServer
-    from transports.native import NativeServer
 
-    from modules.irc import ServerProcessor
+    from backends.irc import ServerProcessor
     backend_name = config.get('server', 'backend')
-    if backend_name == "libbitcoin":
-        # NativeServer cannot be used with libbitcoin
-        native_port = None
-        config.set('server', 'native_port', '')
     try:
-        backend = __import__("modules." + backend_name,
+        backend = __import__("backends." + backend_name,
                              fromlist=["BlockchainProcessor"])
     except ImportError:
-        sys.stderr.write('Unknown backend specified\n')
-        sys.exit(-1)
+        sys.stderr.write("Unknown backend '%s' specified\n" % backend_name)
+        raise
 
     # Create hub
     dispatcher = Dispatcher()
@@ -106,17 +111,13 @@ if __name__ == '__main__':
 
     transports = []
     # Create various transports we need
-    if native_port is not None:
-        server_banner = config.get('server','banner')
-        native_server = NativeServer(shared, chain_proc, server_proc,
-                                     server_banner, host, int(native_port))
-        transports.append(native_server)
-
-    if stratum_tcp_port is not None:
+    if stratum_tcp_port:
+        from transports.stratum_tcp import TcpServer
         tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_port))
         transports.append(tcp_server)
 
-    if stratum_http_port is not None:
+    if stratum_http_port:
+        from transports.stratum_http import HttpServer
         http_server = HttpServer(dispatcher, host, int(stratum_http_port))
         transports.append(http_server)