Bläddra i källkod

Removes the CELERY_TASK_ERROR_WHITELIST setting

Ask Solem 13 år sedan
förälder
incheckning
98d952204f

+ 0 - 2
celery/app/defaults.py

@@ -134,8 +134,6 @@ NAMESPACES = {
         'SEND_TASK_ERROR_EMAILS': Option(False, type='bool'),
         'SEND_TASK_SENT_EVENT': Option(False, type='bool'),
         'STORE_ERRORS_EVEN_IF_IGNORED': Option(False, type='bool'),
-        'TASK_ERROR_WHITELIST': Option((), type='tuple',
-            deprecate_by='2.5', remove_by='4.0'),
         'TASK_PUBLISH_RETRY': Option(True, type='bool'),
         'TASK_PUBLISH_RETRY_POLICY': Option({
                 'max_retries': 100,

+ 0 - 2
celery/task/base.py

@@ -45,14 +45,12 @@ class Task(BaseTask):
     immediate = False
     priority = None
     type = 'regular'
-    error_whitelist = ()
     disable_error_emails = False
     accept_magic_kwargs = None  # get default from app
 
     from_config = BaseTask.from_config + (
         ('exchange_type', 'CELERY_DEFAULT_EXCHANGE_TYPE'),
         ('delivery_mode', 'CELERY_DEFAULT_DELIVERY_MODE'),
-        ('error_whitelist', 'CELERY_TASK_ERROR_WHITELIST'),
     )
 
     # In old Celery the @task decorator didn't exist, so one would create

+ 0 - 3
celery/tests/app/test_app.py

@@ -305,7 +305,6 @@ class test_App(Case):
     def test_config_from_cmdline(self):
         cmdline = ['.always_eager=no',
                    '.result_backend=/dev/null',
-                   '.task_error_whitelist=(list)["a", "b", "c"]',
                    'celeryd.prefetch_multiplier=368',
                    '.foobarstring=(string)300',
                    '.foobarint=(int)300',
@@ -314,8 +313,6 @@ class test_App(Case):
         self.assertFalse(self.app.conf.CELERY_ALWAYS_EAGER)
         self.assertEqual(self.app.conf.CELERY_RESULT_BACKEND, '/dev/null')
         self.assertEqual(self.app.conf.CELERYD_PREFETCH_MULTIPLIER, 368)
-        self.assertListEqual(self.app.conf.CELERY_TASK_ERROR_WHITELIST,
-                             ['a', 'b', 'c'])
         self.assertEqual(self.app.conf.CELERY_FOOBARSTRING, '300')
         self.assertEqual(self.app.conf.CELERY_FOOBARINT, 300)
         self.assertDictEqual(self.app.conf.CELERY_RESULT_ENGINE_OPTIONS,

+ 0 - 9
celery/tests/worker/test_request.py

@@ -375,21 +375,12 @@ class test_TaskRequest(Case):
             einfo = get_ei()
             mail_sent[0] = False
             mytask.send_error_emails = True
-            mytask.error_whitelist = [KeyError]
             tw.on_failure(einfo)
             self.assertTrue(mail_sent[0])
 
-            einfo = get_ei()
-            mail_sent[0] = False
-            mytask.send_error_emails = True
-            mytask.error_whitelist = [SyntaxError]
-            tw.on_failure(einfo)
-            self.assertFalse(mail_sent[0])
-
         finally:
             app.mail_admins = old_mail_admins
             mytask.send_error_emails = old_enable_mails
-            mytask.error_whitelist = ()
 
     def test_already_revoked(self):
         tw = TaskRequest(mytask.name, uuid(), [1], {'f': 'x'})

+ 1 - 5
celery/utils/mail.py

@@ -147,19 +147,15 @@ Just to let you know,
 py-celery at {{hostname}}.
 """.format(EMAIL_SIGNATURE_SEP=EMAIL_SIGNATURE_SEP)
 
-    error_whitelist = None
-
     def __init__(self, task, **kwargs):
         self.task = task
         self.email_subject = kwargs.get('subject', self.subject)
         self.email_body = kwargs.get('body', self.body)
-        self.error_whitelist = getattr(task, 'error_whitelist')
 
     def should_send(self, context, exc):
         """Returns true or false depending on if a task error mail
         should be sent for this type of error."""
-        allow_classes = tuple(map(symbol_by_name,  self.error_whitelist))
-        return not self.error_whitelist or isinstance(exc, allow_classes)
+        return True
 
     def format_subject(self, context):
         return self.subject.strip().format(**context)