diff --git a/pyquarantine/cli.py b/pyquarantine/cli.py index acc81a6..01cb432 100644 --- a/pyquarantine/cli.py +++ b/pyquarantine/cli.py @@ -302,8 +302,8 @@ def release(cfg, args): rcpts = quarantine.release(args.quarantine_id, args.recipient) rcpts = ", ".join(rcpts) logger.info( - f"{quarantine._storage.name}: released message with id {args.quarantine_id} " - f"for {rcpts}") + f"{quarantine._storage.name}: released message with id " + f"{args.quarantine_id} for {rcpts}") def copy(cfg, args): diff --git a/pyquarantine/conditions.py b/pyquarantine/conditions.py index f19549e..edf2f89 100644 --- a/pyquarantine/conditions.py +++ b/pyquarantine/conditions.py @@ -162,9 +162,9 @@ class Conditions: f"envto does not match") return False - logger.debug( - f"envto matches for " - f"envelope-to address {envto}") + logger.debug( + f"envto matches for " + f"envelope-to address {envto}") self.update_msginfo_from_match(milter, match) if self.headers is not None: @@ -190,6 +190,8 @@ class Conditions: "vars does not match") return False + logger.debug(f"vars matches, variable {self.var} is available") + if self.list is not None: envfrom = milter.msginfo["mailfrom"] envto = milter.msginfo["rcpts"] @@ -203,4 +205,7 @@ class Conditions: "list does not match") return False + logger.debug( + "list matches envelope-from and envelope-to address") + return True diff --git a/pyquarantine/config.py b/pyquarantine/config.py index 2630778..8b94717 100644 --- a/pyquarantine/config.py +++ b/pyquarantine/config.py @@ -36,6 +36,7 @@ import jsonschema import logging import re + class BaseConfig: JSON_SCHEMA = { "type": "object",