From 365fa9cd6d4665b4f0a3db631a0c2485d610b61b Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Mon, 3 Feb 2020 12:07:16 +0100 Subject: [PATCH] Fix debug log message and rename quarantines.py to storages.py --- pyquarantine/__init__.py | 8 ++++---- pyquarantine/{quarantines.py => storages.py} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename pyquarantine/{quarantines.py => storages.py} (100%) diff --git a/pyquarantine/__init__.py b/pyquarantine/__init__.py index ca41075..1471fc0 100644 --- a/pyquarantine/__init__.py +++ b/pyquarantine/__init__.py @@ -189,9 +189,9 @@ class Quarantine(object): self.host_whitelist.append(net) if self.host_whitelist: self.logger.debug( - "{}: ignore hosts: {}".format( + "{}: host whitelist: {}".format( self.name, - ", ".join(ignored))) + ", ".join([str(ip) for ip in host_whitelist]))) def notify(self, storage_id, recipient=None, synchronous=True): "Notify recipient about email in storage." @@ -324,12 +324,12 @@ class QuarantineMilter(Milter.Base): for quarantine in self.quarantines.copy(): if quarantine.host_in_whitelist(hostaddr): self.logger.debug( - "host {} is ignored by quarantine {}".format( + "host {} is in whitelist of quarantine {}".format( hostaddr[0], quarantine["name"])) self.quarantines.remove(quarantine) if not self.quarantines: self.logger.debug( - "host {} is ignored by all quarantines, " + "host {} is in whitelist of all quarantines, " "skip further processing", hostaddr[0]) return Milter.ACCEPT diff --git a/pyquarantine/quarantines.py b/pyquarantine/storages.py similarity index 100% rename from pyquarantine/quarantines.py rename to pyquarantine/storages.py