From d4a1e898f158848b333809e7ff037e505bce1bd2 Mon Sep 17 00:00:00 2001 From: Henning Merklinger Date: Sun, 21 Jan 2024 10:59:33 +0100 Subject: [PATCH] sorted push safer config parser --- tgtg_scanner/models/config.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tgtg_scanner/models/config.py b/tgtg_scanner/models/config.py index cc6173d7..e855ce2c 100644 --- a/tgtg_scanner/models/config.py +++ b/tgtg_scanner/models/config.py @@ -209,22 +209,22 @@ def _read_ini(self, parser: configparser.ConfigParser): self._ini_get(parser, "PUSHSAFER", "DeviceID", "device_id") def _read_env(self): - self._env_get_boolean("PUSHSAFER", "enabled") - self._env_get_boolean("PUSH_SAFER", "enabled") if environ.get("PUSH_SAFER", None): log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER", "PUSHSAFER")) - self._env_get_cron("PUSHSAFER_CRON", "cron") - self._env_get_cron("PUSH_SAFER_CRON", "cron") + self._env_get_boolean("PUSH_SAFER", "enabled") + self._env_get_boolean("PUSHSAFER", "enabled") if environ.get("PUSH_SAFER", None): log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER_CRON", "PUSHSAFER_CRON")) - self._env_get("PUSHSAFER_KEY", "key") - self._env_get("PUSH_SAFER_KEY", "key") + self._env_get_cron("PUSH_SAFER_CRON", "cron") + self._env_get_cron("PUSHSAFER_CRON", "cron") if environ.get("PUSH_SAFER", None): log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER_KEY", "PUSHSAFER_KEY")) - self._env_get("PUSHSAFER_DEVICE_ID", "device_id") - self._env_get("PUSH_SAFER_DEVICE_ID", "device_id") + self._env_get("PUSH_SAFER_KEY", "key") + self._env_get("PUSHSAFER_KEY", "key") if environ.get("PUSH_SAFER", None): log.warning(DEPRECIATION_WARNING.format("PUSH_SAFER_DEVICE_ID", "PUSHSAFER_DEVICE_ID")) + self._env_get("PUSH_SAFER_DEVICE_ID", "device_id") + self._env_get("PUSHSAFER_DEVICE_ID", "device_id") @dataclass