catch_up database before launching transports

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 902153c..0bd7e63 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:
@@ -31,7 +34,6 @@ def create_config():
     config.add_section('server')
     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,6 +42,7 @@ def create_config():
     config.add_section('database')
     config.set('database', 'type', 'psycopg2')
     config.set('database', 'database', 'abe')
+    config.set('database', 'limit', '500')
     config.set('server', 'backend', 'abe')
 
     for path in ('/etc/', ''):
@@ -61,19 +64,30 @@ def run_rpc_command(command, stratum_tcp_port):
     method = 'server.' + command
     request = json.dumps( { 'id':0, 'method':method, 'params':[password] } )
     s.send(request + '\n')
-    msg = s.recv(1024)
+    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': 
+
+    if command == 'info': 
+        now = time.time()
+        print 'type           address   sub  version  time' 
         for item in r:
-            print '%15s   %3s  %7s'%( item.get('address'), item.get('subscriptions'), item.get('version') )
+            print '%4s   %15s   %3s  %7s  %.2f'%( item.get('name'), 
+                                                  item.get('address'), 
+                                                  item.get('subscriptions'), 
+                                                  item.get('version'), 
+                                                  (now - item.get('time')) )
+    else:
+        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')
 
@@ -82,16 +96,9 @@ if __name__ == '__main__':
         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 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__("backends." + backend_name,
                              fromlist=["BlockchainProcessor"])
@@ -99,6 +106,8 @@ if __name__ == '__main__':
         sys.stderr.write("Unknown backend '%s' specified\n" % backend_name)
         raise
 
+    print "Starting Electrum server on", host
+
     # Create hub
     dispatcher = Dispatcher()
     shared = dispatcher.shared
@@ -107,29 +116,28 @@ if __name__ == '__main__':
     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"