join threads during server shutdown

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 9c2bb99..57a7b7b 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -57,7 +57,7 @@ def create_config():
     config.set('server', 'ssl_certfile', '')
     config.set('server', 'ssl_keyfile', '')
     config.set('server', 'password', '')
-    config.set('server', 'irc', 'yes')
+    config.set('server', 'irc', 'no')
     config.set('server', 'irc_nick', '')
     config.set('server', 'coin', '')
     config.set('server', 'datadir', '')
@@ -108,9 +108,9 @@ def run_rpc_command(command, stratum_tcp_port):
 
     if command == 'info':
         now = time.time()
-        print 'type           address   sub  version  time'
+        print 'type           address         sub  version  time'
         for item in r:
-            print '%4s   %15s   %3s  %7s  %.2f' % (item.get('name'),
+            print '%4s   %21s   %3s  %7s  %.2f' % (item.get('name'),
                                                    item.get('address'),
                                                    item.get('subscriptions'),
                                                    item.get('version'),
@@ -196,4 +196,6 @@ if __name__ == '__main__':
         except:
             shared.stop()
 
+    server_proc.join()
+    chain_proc.join()
     print_log("Electrum Server stopped")