From: genjix <fake@lol.u>
Date: Wed, 4 Apr 2012 09:24:28 +0000 (+0100)
Subject: try to load ./electrum.conf before /etc/electrum.conf
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=83752715d5d4a8a489c48736fe7e63d997e633e9

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

diff --git a/server.py b/server.py
index 0b13733..728f726 100755
--- 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