try to load ./electrum.conf before /etc/electrum.conf

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 8b67e49..728f726 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -33,17 +33,17 @@ config.add_section('database')
 config.set('database', 'type', 'psycopg2')
 config.set('database', 'database', 'abe')
 
-try:
-    f = open('/etc/electrum.conf','r')
-    config.readfp(f)
-    f.close()
-except:
-    print "Could not read electrum.conf. I will use the default values."
+for path in ('', '/etc/'):
+    filename = path + 'electrum.conf'
+    try:
+        with open(filename, 'r') as f:
+            config.readfp(f)
+    except:
+        print "Could not read %s. Falling back." % filename
 
 try:
-    f = open('/etc/electrum.banner','r')
-    config.set('server','banner', f.read())
-    f.close()
+    with open('/etc/electrum.banner', 'r') as f:
+        config.set('server','banner', f.read())
 except:
     pass
 
@@ -72,10 +72,10 @@ if __name__ == '__main__':
 
     if len(sys.argv)>1:
         import jsonrpclib
-        server = jsonrpclib.Server('http://%s:8081'%host)
+        server = jsonrpclib.Server('http://%s:%s'%(host,stratum_http_port))
         cmd = sys.argv[1]
         if cmd == 'stop':
-            out = server.stop(password)
+            out = server.server.stop(password)
         else:
             out = "Unknown command: '%s'" % cmd
         print out
@@ -96,7 +96,7 @@ if __name__ == '__main__':
     transports = []
     if native_port: transports.append( NativeServer(shared, abe, sb, config.get('server','banner'), host, int(native_port)) )
     if stratum_tcp_port: transports.append( TcpServer(dispatcher, host, int(stratum_tcp_port)) )
-    if stratum_http_port: transports.append( HttpServer(dispatcher, host, int(stratum_http_port), password) )
+    if stratum_http_port: transports.append( HttpServer(dispatcher, host, int(stratum_http_port)) )
     for server in transports:
         server.start()