add option to skip metadata and save storage_id during runtime

This commit is contained in:
2021-09-10 01:42:33 +02:00
parent 83df637792
commit 45f5a80d85
3 changed files with 24 additions and 17 deletions

View File

@@ -176,6 +176,10 @@ class ActionConfig(BaseConfig):
f"{self['name']}: file quarantine directory "
f"'{self['directory']}' does not exist or is "
f"not writable")
if "skip_metadata" in cfg:
self.add_bool_arg(cfg, "skip_metadata")
else:
raise RuntimeError(
f"{self['name']}: storage_type: invalid storage type")
@@ -217,12 +221,11 @@ class Action:
def execute(self, milter):
"""Execute configured action."""
logger = CustomLogger(
self.logger, {"name": self._name, "qid": milter.qid})
if self.conditions is None or \
self.conditions.match(envfrom=milter.mailfrom,
envto=[*milter.rcpts],
headers=milter.msg.items()):
logger = CustomLogger(
self.logger, {"name": self._name, "qid": milter.qid})
return self._class.execute(
milter=milter, pretend=self.pretend, logger=logger)