commit b083fe7e44a09ce76a0dc301de41d5476a24f944 Author: David Fifield <david@bamsoftware.com> Date: Sun May 5 02:38:08 2013 -0700 Handle ssl.SSLError, socket.error in the top-level exception handler. See https://trac.torproject.org/projects/tor/ticket/8284. --- facilitator/facilitator-email-poller | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 50e3f7d..ee69dd9 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -327,7 +327,7 @@ while True: try: imap = imap_login() imap_loop(imap) - except imaplib.IMAP4.abort, e: + except (imaplib.IMAP4.abort, ssl.SSLError, socket.error), e: # Try again after a disconnection. log(u"lost server connection: %s" % str(e)) except KeyboardInterrupt: