From 3103724d654e72f747b67909f4193dee7c72af18 Mon Sep 17 00:00:00 2001 From: Dominik Chilla Date: Thu, 24 Jun 2021 14:55:34 +0200 Subject: [PATCH] reflect policy in debug mode after fetch --- app/exota-milter.py | 8 ++++---- app/policy.py | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/exota-milter.py b/app/exota-milter.py index b9d4f71..073e344 100644 --- a/app/exota-milter.py +++ b/app/exota-milter.py @@ -302,8 +302,8 @@ class ExOTAMilter(Milter.Base): try: policy = g_policy_backend.get(self.hdr_from_domain) logging.debug(self.mconn_id + "/" + str(self.getsymval('i')) + - "/EOM: Policy for 5322.from_domain={0} fetched from backend".format( - self.hdr_from_domain + "/EOM: Policy for 5322.from_domain={0} fetched from backend: *{1}*".format( + self.hdr_from_domain, str(policy) ) ) except ExOTAPolicyBackendException as e: @@ -335,8 +335,8 @@ class ExOTAMilter(Milter.Base): try: policy = g_policy_backend.get(self.hdr_resent_from_domain) logging.debug(self.mconn_id + "/" + str(self.getsymval('i')) + - "/EOM: Policy for 5322.resent_from_domain={0} fetched from backend".format( - self.hdr_resent_from_domain + "/EOM: Policy for 5322.resent_from_domain={0} fetched from backend: *{1}*".format( + self.hdr_resent_from_domain, str(policy) ) ) self.forwarded = True diff --git a/app/policy.py b/app/policy.py index 85eabcb..7b25c1d 100644 --- a/app/policy.py +++ b/app/policy.py @@ -30,6 +30,11 @@ class ExOTAPolicy(): else: # DKIM alignment per policy enabled by default self.dkim_alignment_required = True + + def __str__(self): + return "Tenant-ID={0}, DKIM={1}, DKIM-alignment-required={2}". format( + self.tenant_id, self.dkim_enabled, self.dkim_alignment_required + ) def get_tenant_id(self): return self.tenant_id