From 131919bdfbf122e33d482bddc0978a16ac68572f Mon Sep 17 00:00:00 2001 From: Hemna Date: Fri, 5 Feb 2021 15:32:36 -0500 Subject: [PATCH] Wrap another server call with try except Dreamhost email is total garbage. Stop using it. --- aprsd/email.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/aprsd/email.py b/aprsd/email.py index 921b14f..74739c5 100644 --- a/aprsd/email.py +++ b/aprsd/email.py @@ -480,10 +480,15 @@ class APRSDEmailThread(threads.APRSDThread): # LOG.debug("Message flags/tags: " + str(server.get_flags(msgid)[msgid])) # if "APRS" not in server.get_flags(msgid)[msgid]: # in python3, imap tags are unicode. in py2 they're strings. so .decode them to handle both - taglist = [ - x.decode(errors="ignore") - for x in server.get_flags(msgid)[msgid] - ] + try: + taglist = [ + x.decode(errors="ignore") + for x in server.get_flags(msgid)[msgid] + ] + except Exception as e: + LOG.exception("Failed to get flags.", e) + break + if "APRS" not in taglist: # if msg not flagged as sent via aprs LOG.debug("Try single fetch.")