Changeset 28

Timestamp:

10/16/07 03:26:29 (1 year ago)

Author:

amcgregor

Message:

Applied handling_of_temporary_errors.patch as per ticket #17.

Location:

branches/2.0.5

Files:

• tests/test_errorhandling.py (added)
• turbomail/pool.py (modified) (3 diffs)

branches/2.0.5/turbomail/pool.py

@@ -4 +4 @@
 
 import logging
+import smtplib
+import socket
+import time
 log = logging.getLogger("turbomail.pool")
 
@@ -203 +206 @@
                                 break
                         
+                        unit = None
                         try:
                                 unit = self._queue.get(True, self._timeout)
@@ -210 +214 @@
                                 log.debug("Worker death from starvation.")
                                 break
+                        except (socket.error, smtplib.SMTPException), exception:
+                                log.exception(exception)
+                                log.error("Exception occured when sending mail. Retrying...")
+                                time.sleep(1)
+                                self._queue.put(unit, block=False)
+                                log.debug("Worker death by exception.")
+                                break
                         
                         count += 1