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

diff --git a/server.py b/server.py
index dc551ed..f8073b5 100755
--- a/server.py
+++ b/server.py
@@ -18,20 +18,22 @@
 import time, sys, traceback
 import ConfigParser
 
+import logging
+logging.basicConfig()
+
 def attempt_read_config(config, filename):
     try:
         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')
     config.set('server', 'stratum_http_port', '8081')
     config.set('server', 'password', '')
@@ -40,9 +42,10 @@ def create_config():
     config.add_section('database')
     config.set('database', 'type', 'psycopg2')
     config.set('database', 'database', 'abe')
+    config.set('database', 'limit', '1000')
     config.set('server', 'backend', 'abe')
 
-    for path in ('', '/etc/'):
+    for path in ('/etc/', ''):
         filename = path + 'electrum.conf'
         attempt_read_config(config, filename)
 
@@ -54,76 +57,87 @@ 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)
+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 == 'info': 
+        now = time.time()
+        print 'type           address   sub  version  time' 
+        for item in r:
+            print '%4s   %15s   %3s  %7s  %.2f'%( item.get('name'), 
+                                                  item.get('address'), 
+                                                  item.get('subscriptions'), 
+                                                  item.get('version'), 
+                                                  (now - item.get('time')) )
     else:
-        result = "Unknown command: '%s'" % command
-    print result
+        print r
 
 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', '')
-        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
+
+    print "Starting Electrum server on", host
 
     # 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)
 
+    # catch_up first
+    n = chain_proc.store.main_iteration()
+    print "blockchain: %d blocks"%n
+
     server_proc = ServerProcessor(config)
     dispatcher.register('server', server_proc)
 
     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)
 
     for server in transports:
         server.start()
 
-    print "Starting Electrum server on", host
     while not shared.stopped():
         time.sleep(1)
     print "Server stopped"