From e97ade2d8cf8c0a927cd96bd07380ea35b499d98 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Tue, 2 Dec 2014 02:20:17 +0200
Subject: simplify config loading, allow missing config values

---
 src-py/rhizi_server.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'src-py')

diff --git a/src-py/rhizi_server.py b/src-py/rhizi_server.py
index cef57f36..bda762a3 100644
--- a/src-py/rhizi_server.py
+++ b/src-py/rhizi_server.py
@@ -27,10 +27,16 @@ class Config(object):
             #
             # TODO: config option documentation
             #
-            ret.neo4j_url = cfg['neo4j_url']
-            ret.listen_address = cfg['listen_address']
-            ret.listen_port = cfg['listen_port']
+            # htpasswd_path
+            # listen_address
+            # listen_port
+            # neo4j_url
+            # root_path
 
+            for k, v in cfg.items():
+                ret.__setattr__(k, v)
+
+        ret.__setattr__('config_dir', os.path.dirname(file_path))  # bypass prop restriction
         return ret
 
     @property
@@ -41,6 +47,14 @@ class Config(object):
     def tx_api_path(self):
         return '/db/data/transaction'
 
+    @property
+    def config_dir_path(self):
+        return self.config_dir
+
+    @property
+    def secret_key(self):
+        return self.SECRET_KEY
+
 def init_logging():
 
     log = logging.getLogger('rhizi')
-- 
cgit v1.3.1