add timestamp to all log lines

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index b727b65..9ef014d 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -67,8 +67,13 @@ def create_config():
 
 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 )))
+    try:
+        s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
+        s.connect(( host, int(stratum_tcp_port )))
+    except:
+        print "cannot connect to server."
+        return
+
     method = 'server.' + command
     request = json.dumps( { 'id':0, 'method':method, 'params':[password] } )
     s.send(request + '\n')
@@ -109,7 +114,7 @@ if __name__ == '__main__':
         run_rpc_command(sys.argv[1], stratum_tcp_port)
         sys.exit(0)
 
-    from processor import Dispatcher
+    from processor import Dispatcher, print_log
     from backends.irc import ServerProcessor
 
     backend_name = config.get('server', 'backend')
@@ -123,7 +128,8 @@ if __name__ == '__main__':
         print "Unknown backend '%s' specified\n" % backend_name
         sys.exit(1)
 
-    print "\n\n\n\nStarting Electrum server on", host
+    for i in range(5): print ""
+    print_log( "Starting Electrum server on", host)
 
     # Create hub
     dispatcher = Dispatcher()
@@ -167,5 +173,5 @@ if __name__ == '__main__':
         except:
             shared.stop()
 
-    print "Electrum Server stopped"
+    print_log( "Electrum Server stopped")