Merge pull request #34 from b3yond/master

Backporting IMAP error exceptions
This commit is contained in:
b3yond 2018-09-08 11:29:01 +02:00 committed by GitHub
commit 05c09c97c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

1
.gitignore vendored
View file

@ -5,6 +5,7 @@ __pycache__/
last_mention last_mention
last_mail last_mail
ticketfrei.cfg ticketfrei.cfg
ticketfrei.sqlite
seen_toots.pickle seen_toots.pickle
seen_toots.pickle.part seen_toots.pickle.part
pip-selfcheck.json pip-selfcheck.json

View file

@ -74,7 +74,7 @@ feel free to use them as an orientation.
Just add the words to the goodlist, which you want to require. A Just add the words to the goodlist, which you want to require. A
report is only spread, if it contains at least one of them. If you report is only spread, if it contains at least one of them. If you
want to RT everything, just add a ```\*```. want to RT everything, just add a ```*```.
There is also a blacklist, which you can use to automatically sort There is also a blacklist, which you can use to automatically sort
out malicious tweets. Be careful though, our filter can't read the out malicious tweets. Be careful though, our filter can't read the

View file

@ -70,7 +70,14 @@ class Mailbot(object):
crawl for new mails. crawl for new mails.
:return: msgs: (list of report.Report objects) :return: msgs: (list of report.Report objects)
""" """
rv, data = self.mailbox.select("Inbox") try:
rv, data = self.mailbox.select("Inbox")
except imaplib.IMAP4.abort:
rv = "Crawling Mail failed"
logger.error(rv, exc_info=True)
except TimeoutError:
rv = "No Connection"
logger.error(rv, exc_info=True)
msgs = [] msgs = []
if rv == 'OK': if rv == 'OK':
rv, data = self.mailbox.search(None, "ALL") rv, data = self.mailbox.search(None, "ALL")