github-public-mirror/sos-milter
1
0
Fork 0
mirror of https://github.com/chillout2k/sos-milter.git synced 2025-12-12 18:10:18 +00:00
Code Issues Projects Releases Wiki Activity

log cosmetics

Browse Source
This commit is contained in:
Dominik Chilla 2023-06-12 21:20:40 +02:00
parent e0e950cab8
commit 21ae716845
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/sos-milter.py
View File

@ -158,13 +158,13 @@ class SOSMilter(Milter.Base):
self.queue_id = self.getsymval('i') self.queue_id = self.getsymval('i')
if self.queue_id is None: if self.queue_id is None:
logging.error(self.mconn_id + logging.error(self.mconn_id +
"EOM exception: could not retrieve milter-macro (i)!" "/EOM exception: could not retrieve milter-macro (i)!"
) )
self.setreply('450','4.7.1', g_milter_tmpfail_message) self.setreply('450','4.7.1', g_milter_tmpfail_message)
return Milter.TEMPFAIL return Milter.TEMPFAIL
else: else:
logging.debug(self.mconn_id + logging.debug(self.mconn_id +
"/EOM Queue-ID: {0}".format(self.queue_id) "/EOM queue_id={0}".format(self.queue_id)
) )
if self.is_null_sender: if self.is_null_sender:
@ -216,7 +216,7 @@ class SOSMilter(Milter.Base):
"addheader() failed: " + traceback.format_exc() "addheader() failed: " + traceback.format_exc()
) )
ex = str( ex = str(
"SPF-record (-all) of 5321_from_domain=" "SPF-record (-all) of 5321.from_domain="
+ self.env_from_domain + " does not permit us to relay this message!" + self.env_from_domain + " does not permit us to relay this message!"
) )
logging.info(self.mconn_id + '/' + self.queue_id + "/EOM " + logging.info(self.mconn_id + '/' + self.queue_id + "/EOM " +
@ -230,7 +230,7 @@ class SOSMilter(Milter.Base):
else: else:
logging.debug(self.mconn_id + logging.debug(self.mconn_id +
'/' + self.queue_id + "/EOM " + '/' + self.queue_id + "/EOM " +
"No SPF-record found for {0}".format(self.env_from_domain) "No SPF-record found for 5321.from_domain={0}".format(self.env_from_domain)
) )
return Milter.CONTINUE return Milter.CONTINUE