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

improve logging on serialization error

Browse Source
This commit is contained in:
Thomas Oettli
2021-10-06 21:11:43 +02:00
parent af8eb8c141
commit bfac62c2b7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pyquarantine/__init__.py
View File

@@ -96,15 +96,14 @@ class QuarantineMilter(Milter.Base):
def msg_as_bytes(self): def msg_as_bytes(self):
try: try:
data = self.msg.as_bytes() data = self.msg.as_bytes()
except Exception: except Exception as e:
self.logger.warning( self.logger.warning(f"unable to serialize message as bytes: {e}")
"unable to serialize message as bytes, "
"try to serialize as str and encode")
try: try:
self.logger.warning("try to serialize as str and encode")
data = self.msg.as_string().encode("ascii", errors="replace") data = self.msg.as_string().encode("ascii", errors="replace")
except Exception as e: except Exception as e:
self.logger.exception( self.logger.error(
"unable to serialize message, giving up") f"unable to serialize message, giving up: {e}")
raise e raise e
return data return data