From: genjix <fake@lol.u>
Date: Wed, 4 Apr 2012 10:58:14 +0000 (+0100)
Subject: load /etc/electrum.conf first, then ./electrum.conf (takes high precedence over ... 
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=325df8b4dd49b317b44389d145b17ff538a1003c

load /etc/electrum.conf first, then ./electrum.conf (takes high precedence over /etc)
---

diff --git a/server.py b/server.py
index dc551ed..71878cd 100755
--- a/server.py
+++ b/server.py
@@ -23,7 +23,7 @@ def attempt_read_config(config, filename):
         with open(filename, 'r') as f:
             config.readfp(f)
     except IOError:
-        print "Could not read %s. Falling back." % filename
+        pass
 
 def create_config():
     config = ConfigParser.ConfigParser()
@@ -42,7 +42,7 @@ def create_config():
     config.set('database', 'database', 'abe')
     config.set('server', 'backend', 'abe')
 
-    for path in ('', '/etc/'):
+    for path in ('/etc/', ''):
         filename = path + 'electrum.conf'
         attempt_read_config(config, filename)