From be8395dbe341e5cca09fd7ff3630b6240f846ac3 Mon Sep 17 00:00:00 2001 From: Ola Thoresen Date: Wed, 20 Jan 2021 19:56:15 +0100 Subject: [PATCH 1/2] Detecting other IMAP-errors. Adding short sleep to avoid hammering the IMAP-server on error --- parsedmarc/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index ca4f1e7..5fe1f29 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -8,6 +8,7 @@ import shutil import xml.parsers.expat as expat import json from datetime import datetime +from time import sleep from collections import OrderedDict from io import BytesIO, StringIO from gzip import GzipFile @@ -1234,6 +1235,10 @@ def watch_inbox(host, username, password, callback, port=None, ssl=True, idle_timeout=idle_timeout) except (timeout, IMAPClientError): logger.warning("IMAP connection timeout. Reconnecting...") + sleep(5) + except Exception as e: + logger.warning("IMAP connection error. {0}. Reconnecting...".format(e)) + sleep(5) def save_output(results, output_directory="output"): From 76614bdc94acc796b0307372e640d3836f0a77c2 Mon Sep 17 00:00:00 2001 From: Ola Thoresen Date: Thu, 21 Jan 2021 08:34:56 +0100 Subject: [PATCH 2/2] Fixing flake-error --- parsedmarc/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 5fe1f29..809dd63 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -1237,7 +1237,8 @@ def watch_inbox(host, username, password, callback, port=None, ssl=True, logger.warning("IMAP connection timeout. Reconnecting...") sleep(5) except Exception as e: - logger.warning("IMAP connection error. {0}. Reconnecting...".format(e)) + logger.warning("IMAP connection error. {0}. " + "Reconnecting...".format(e)) sleep(5)