fix DatabaseList init

This commit is contained in:
2023-12-12 14:32:19 +01:00
parent 479c1513a3
commit af800c73aa
2 changed files with 10 additions and 8 deletions

View File

@@ -33,7 +33,7 @@ class Conditions:
self.logger.setLevel(cfg.get_loglevel(debug))
for arg in ("local", "hosts", "envfrom", "envto", "headers", "metavar",
"var"):
"var", "list"):
if arg not in cfg:
setattr(self, arg, None)
continue
@@ -59,16 +59,16 @@ class Conditions:
header, re.IGNORECASE + re.DOTALL + re.MULTILINE))
except re.error as e:
raise RuntimeError(e)
elif arg == "list":
if cfg["list"]["type"] == "db":
cfg["list"]["name"] = cfg["name"]
cfg["list"]["loglevel"] = cfg["loglevel"]
self.list = DatabaseList(cfg["list"], debug)
else:
raise RuntimeError("invalid list type")
else:
setattr(self, arg, cfg[arg])
self.list = cfg["list"] if "list" in cfg else None
if self.list is not None:
if self.list["type"] == "db":
self.list = DatabaseList(self.list, debug)
else:
raise RuntimeError("invalid list type")
def __str__(self):
cfg = []
for arg in ("local", "hosts", "envfrom", "envto", "headers",