Compare commits

..

No commits in common. "dad1bf917136d889700779b1af3398d6f045d456" and "73fdddc144ce5cc283e8d12534aff835aff5ba3e" have entirely different histories.

2 changed files with 4 additions and 9 deletions

View File

@ -302,8 +302,8 @@ class ExOTAMilter(Milter.Base):
try: try:
policy = g_policy_backend.get(self.hdr_from_domain) policy = g_policy_backend.get(self.hdr_from_domain)
logging.debug(self.mconn_id + "/" + str(self.getsymval('i')) + logging.debug(self.mconn_id + "/" + str(self.getsymval('i')) +
"/EOM: Policy for 5322.from_domain={0} fetched from backend: *{1}*".format( "/EOM: Policy for 5322.from_domain={0} fetched from backend".format(
self.hdr_from_domain, str(policy) self.hdr_from_domain
) )
) )
except ExOTAPolicyBackendException as e: except ExOTAPolicyBackendException as e:
@ -335,8 +335,8 @@ class ExOTAMilter(Milter.Base):
try: try:
policy = g_policy_backend.get(self.hdr_resent_from_domain) policy = g_policy_backend.get(self.hdr_resent_from_domain)
logging.debug(self.mconn_id + "/" + str(self.getsymval('i')) + logging.debug(self.mconn_id + "/" + str(self.getsymval('i')) +
"/EOM: Policy for 5322.resent_from_domain={0} fetched from backend: *{1}*".format( "/EOM: Policy for 5322.resent_from_domain={0} fetched from backend".format(
self.hdr_resent_from_domain, str(policy) self.hdr_resent_from_domain
) )
) )
self.forwarded = True self.forwarded = True

View File

@ -30,11 +30,6 @@ class ExOTAPolicy():
else: else:
# DKIM alignment per policy enabled by default # DKIM alignment per policy enabled by default
self.dkim_alignment_required = True 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): def get_tenant_id(self):
return self.tenant_id return self.tenant_id