Merge pull request #34 from b3yond/master
Backporting IMAP error exceptions
This commit is contained in:
commit
05c09c97c6
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -5,6 +5,7 @@ __pycache__/
|
|||
last_mention
|
||||
last_mail
|
||||
ticketfrei.cfg
|
||||
ticketfrei.sqlite
|
||||
seen_toots.pickle
|
||||
seen_toots.pickle.part
|
||||
pip-selfcheck.json
|
||||
|
|
|
@ -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
|
||||
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
|
||||
out malicious tweets. Be careful though, our filter can't read the
|
||||
|
|
|
@ -70,7 +70,14 @@ class Mailbot(object):
|
|||
crawl for new mails.
|
||||
: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 = []
|
||||
if rv == 'OK':
|
||||
rv, data = self.mailbox.search(None, "ALL")
|
||||
|
|
Loading…
Reference in a new issue