From 3e12ef1b1aa9a7ba6b9629affd2d07346be7e4ca Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Mon, 4 Dec 2023 08:55:30 +0100 Subject: [PATCH] More robustness against flawed config files 1) Don't bail out with an unset CONN_STR if we don't have ANY connection_string set in our config file. 2) No need to guard against missing section [media_api], we verify its existance a few lines above. --- cleanmedia | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cleanmedia b/cleanmedia index b3b6cf9..0283061 100755 --- a/cleanmedia +++ b/cleanmedia @@ -170,9 +170,10 @@ def read_config(conf_file: Union[str, Path]) -> Tuple[Path, str]: logging.error("Missing section media_api") exit(1) + CONN_STR = None if "global" in config and "database" in config["global"]: CONN_STR = config["global"]["database"].get("connection_string", None) - elif "media_api" in config and "database" in config["media_api"]: + elif "database" in config["media_api"]: logging.debug("No database section in global, but one in media_api, using that") CONN_STR = config["media_api"]["database"].get("connection_string", None)