From 1e5f7c3ec48c1c18fb238e4bb8b77f5118c8568a Mon Sep 17 00:00:00 2001 From: Ralf Ramsauer Date: Sat, 15 Jun 2019 19:54:37 +0200 Subject: [PATCH] Config: allow multiple config topics Signed-off-by: Ralf Ramsauer --- doorlockd | 2 +- etc/doorlockd.cfg | 2 +- pydoorlock/Config.py | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doorlockd b/doorlockd index 0e3fd98..c4d7992 100755 --- a/doorlockd +++ b/doorlockd @@ -44,7 +44,7 @@ date_fmt = '%Y-%m-%d %H:%M:%S' log_fmt = '%(asctime)-15s %(levelname)-8s %(message)s' log = logging.getLogger() -cfg = Config(SYSCONFDIR) +cfg = Config(SYSCONFDIR, 'doorlockd') class Logic: diff --git a/etc/doorlockd.cfg b/etc/doorlockd.cfg index 62526a8..b990fbb 100644 --- a/etc/doorlockd.cfg +++ b/etc/doorlockd.cfg @@ -1,4 +1,4 @@ -[doorlock] +[doorlockd] DEBUG = False SIMULATE_SERIAL = False diff --git a/pydoorlock/Config.py b/pydoorlock/Config.py index c7b6ea9..11ce025 100644 --- a/pydoorlock/Config.py +++ b/pydoorlock/Config.py @@ -32,9 +32,8 @@ def check_exists(func): class Config: - config_topic = 'doorlock' - - def __init__(self, sysconfdir): + def __init__(self, sysconfdir, config_topic): + self.config_topic = config_topic self.config = ConfigParser() self.config.read(join(sysconfdir, 'doorlockd.cfg'))