spacefreak/pyquarantine-milter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

change logging

Browse Source
This commit is contained in:
Thomas Oettli
2021-10-04 19:36:18 +02:00
parent 0a25e67f15
commit c4755a3316
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pyquarantine/storage.py
View File

@@ -176,8 +176,8 @@ class FileMailStorage(BaseMailStorage):
return return
# save mail # save mail
logger.debug(f"save message to {datafile}")
self._save_datafile(datafile, data) self._save_datafile(datafile, data)
logger.debug(f"stored message in file {datafile}")
logger.info(f"stored message with id {storage_id}") logger.info(f"stored message with id {storage_id}")
if not self.metadata: if not self.metadata:
@@ -194,6 +194,7 @@ class FileMailStorage(BaseMailStorage):
"vars": variables} "vars": variables}
try: try:
logger.debug(f"save metadata to {metafile}")
self._save_metafile(metafile, metadata) self._save_metafile(metafile, metadata)
except RuntimeError as e: except RuntimeError as e:
os.remove(datafile) os.remove(datafile)
@@ -501,9 +502,11 @@ class Quarantine:
if not rcpts: if not rcpts:
# all recipients whitelisted # all recipients whitelisted
return return
logger.info(f"add to quarantine for recipients: {rcpts}")
milter.msginfo["rcpts"] = rcpts milter.msginfo["rcpts"] = rcpts
if self._milter_action in ["REJECT", "DISCARD"]:
logger.info(f"quarantine message for recipients: {rcpts}")
self._storage.execute(milter) self._storage.execute(milter)
if self._notification is not None: if self._notification is not None: