Make error e-mail timeout configurable by adding the EMAIL_TIMEOUT setting. Closes #248.

celery/conf.py

@@ -97,6 +97,7 @@ _DEFAULTS = {
     "SERVER_EMAIL": "celery@localhost",
     "EMAIL_HOST": "localhost",
     "EMAIL_PORT": 25,
+    "EMAIL_TIMEOUT": 2,
     "ADMINS": (),
 }
 

celery/utils/mail.py

@@ -38,7 +38,7 @@ class Message(object):
 class Mailer(object):
 
     def __init__(self, host="localhost", port=0, user=None, password=None,
-            timeout=2):
+            timeout=None):
         self.host = host
         self.port = port
         self.user = user
@@ -81,7 +81,8 @@ def mail_admins(subject, message, fail_silently=False):
     try:
         mailer = Mailer(conf.EMAIL_HOST, conf.EMAIL_PORT,
                         conf.EMAIL_HOST_USER,
-                        conf.EMAIL_HOST_PASSWORD)
+                        conf.EMAIL_HOST_PASSWORD,
+                        conf.EMAIL_TIMEOUT)
         mailer.send(message)
     except Exception, exc:
         if not fail_silently: