[tor-commits] [flashproxy/master] Add M2Crypto.SSL.SSLError to ignored IMAP errors.

[dcf at torproject.org]

commit da684cdac9db9b87e8ebf9a9df54b9a38be9b22c
Author: David Fifield <david at bamsoftware.com>
Date:   Tue Aug 27 20:55:05 2013 -0700

    Add M2Crypto.SSL.SSLError to ignored IMAP errors.
    
    facilitator-email-poller crashed with
    
    Traceback (most recent call last):
      File "/usr/local/bin/facilitator-email-poller", line 408, in <module>
        imap_loop(imap)
      File "/usr/local/bin/facilitator-email-poller", line 324, in imap_loop
        typ, data = imap.select("[Gmail]/All Mail")
      File "/usr/lib/python2.6/imaplib.py", line 642, in select
        typ, dat = self._simple_command(name, mailbox)
      File "/usr/lib/python2.6/imaplib.py", line 1060, in _simple_command
        return self._command_complete(name, self._command(name, *args))
      File "/usr/lib/python2.6/imaplib.py", line 888, in _command_complete
        typ, data = self._get_tagged_response(tag)
      File "/usr/lib/python2.6/imaplib.py", line 989, in _get_tagged_response
        self._get_response()
      File "/usr/lib/python2.6/imaplib.py", line 906, in _get_response
        resp = self._get_line()
      File "/usr/lib/python2.6/imaplib.py", line 999, in _get_line
        line = self.readline()
      File "/usr/lib/python2.6/imaplib.py", line 1170, in readline
        char = self.sslobj.read(1)
      File "/usr/lib/pymodules/python2.6/M2Crypto/SSL/Connection.py", line 223, in read
        return self._read_nbio(size)
      File "/usr/lib/pymodules/python2.6/M2Crypto/SSL/Connection.py", line 212, in _read_nbio
        return m2.ssl_read_nbio(self.ssl, size)
    M2Crypto.SSL.SSLError: unexpected eof
---
 facilitator/facilitator-email-poller |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller
index 8b9f10a..950de8e 100755
--- a/facilitator/facilitator-email-poller
+++ b/facilitator/facilitator-email-poller
@@ -406,7 +406,7 @@ while True:
     try:
         imap = imap_login()
         imap_loop(imap)
-    except (imaplib.IMAP4.abort, ssl.SSLError, socket.error), e:
+    except (imaplib.IMAP4.abort, ssl.SSLError, M2Crypto.SSL.SSLError, socket.error), e:
         # Try again after a disconnection.
         log(u"lost server connection: %s" % str(e))
     except KeyboardInterrupt: