X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=9b04e06c3696543d52a9640f16e9acba6beb18ae;hb=9e7a2c2f2c28ca35e80b5698df4da33174a9a3e1;hp=dc551edb0c0454f65e5f10af9034c5267ae01bf1;hpb=767386020b1c27cc12269d30cf328ee76ceb7ad9;p=electrum-server.git

diff --git a/server.py b/server.py
index dc551ed..9b04e06 100755
--- a/server.py
+++ b/server.py
@@ -23,13 +23,13 @@ def attempt_read_config(config, filename):
         with open(filename, 'r') as f:
             config.readfp(f)
     except IOError:
-        print "Could not read %s. Falling back." % filename
+        pass
 
 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')
@@ -42,7 +42,7 @@ def create_config():
     config.set('database', 'database', 'abe')
     config.set('server', 'backend', 'abe')
 
-    for path in ('', '/etc/'):
+    for path in ('/etc/', ''):
         filename = path + 'electrum.conf'
         attempt_read_config(config, filename)
 
@@ -54,14 +54,20 @@ 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 = s.recv(1024)
+    s.close()
+    r = json.loads(msg).get('result')
+    if command == 'stop': print r
+    elif command == 'info': 
+        for item in r:
+            print '%15s   %3s  %7s'%( item.get('address'), item.get('subscriptions'), item.get('version') )
 
 if __name__ == '__main__':
     config = create_config()
@@ -72,7 +78,7 @@ if __name__ == '__main__':
     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
@@ -80,25 +86,25 @@ if __name__ == '__main__':
     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', '')
-        from modules.python_bitcoin import BlockchainProcessor
-    elif backend_name == "abe":
-        from modules.abe import AbeProcessor as BlockchainProcessor
-    else:
-        sys.stderr.write('Unknown backend specified\n')
-        sys.exit(-1)
+    try:
+        backend = __import__("backends." + backend_name,
+                             fromlist=["BlockchainProcessor"])
+    except ImportError:
+        sys.stderr.write("Unknown backend '%s' specified\n" % backend_name)
+        raise
 
     # Create hub
     dispatcher = Dispatcher()
     shared = dispatcher.shared
 
     # Create and register processors
-    chain_proc = BlockchainProcessor(config)
+    chain_proc = backend.BlockchainProcessor(config)
     dispatcher.register('blockchain', chain_proc)
 
     server_proc = ServerProcessor(config)
@@ -106,17 +112,17 @@ if __name__ == '__main__':
 
     transports = []
     # Create various transports we need
-    if native_port is not None:
+    if native_port:
         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:
         tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_port))
         transports.append(tcp_server)
 
-    if stratum_http_port is not None:
+    if stratum_http_port:
         http_server = HttpServer(dispatcher, host, int(stratum_http_port))
         transports.append(http_server)