From babf98ec0c2c1851e2838a52115d08c4f0b71844 Mon Sep 17 00:00:00 2001
From: dojutsu-user <vaibhgupt199@gmail.com>
Date: Wed, 2 Jan 2019 15:05:38 +0530
Subject: [PATCH] use task.throws

---
 readthedocs/projects/tasks.py | 20 ++++++++++++++++----
 readthedocs/settings/base.py  |  3 +++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py
index 820e205ae84..bcc81913753 100644
--- a/readthedocs/projects/tasks.py
+++ b/readthedocs/projects/tasks.py
@@ -60,6 +60,7 @@
     ProjectBuildsSkippedError,
     VersionLockedError,
     YAMLParseError,
+    BuildEnvironmentWarning,
 )
 from readthedocs.doc_builder.loader import get_builder_class
 from readthedocs.doc_builder.python_environments import Conda, Virtualenv
@@ -272,7 +273,18 @@ def run(self, version_pk):  # pylint: disable=arguments-differ
         return False
 
 
-@app.task(bind=True, max_retries=5, default_retry_delay=7 * 60)
+@app.task(
+    bind=True,
+    max_retries=5,
+    default_retry_delay=7 * 60,
+    throws=(
+        VersionLockedError,
+        ProjectBuildsSkippedError,
+        YAMLParseError,
+        BuildTimeoutError,
+        ProjectBuildsSkippedError
+    )
+)
 def update_docs_task(self, project_id, *args, **kwargs):
     step = UpdateDocsTaskStep(task=self)
     return step.run(project_id, *args, **kwargs)
@@ -1022,7 +1034,7 @@ def update_search(version_pk, commit, delete_non_commit_files=True):
     )
 
 
-@app.task(queue='web')
+@app.task(queue='web', throws=(BuildEnvironmentWarning,))
 def symlink_project(project_pk):
     project = Project.objects.get(pk=project_pk)
     for symlink in [PublicSymlink, PrivateSymlink]:
@@ -1030,7 +1042,7 @@ def symlink_project(project_pk):
         sym.run()
 
 
-@app.task(queue='web')
+@app.task(queue='web', throws=(BuildEnvironmentWarning,))
 def symlink_domain(project_pk, domain_pk, delete=False):
     project = Project.objects.get(pk=project_pk)
     domain = Domain.objects.get(pk=domain_pk)
@@ -1070,7 +1082,7 @@ def broadcast_remove_orphan_symlinks():
     broadcast(type='web', task=remove_orphan_symlinks, args=[])
 
 
-@app.task(queue='web')
+@app.task(queue='web', throws=(BuildEnvironmentWarning,))
 def symlink_subproject(project_pk):
     project = Project.objects.get(pk=project_pk)
     for symlink in [PublicSymlink, PrivateSymlink]:
diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
index 16237b12f40..a6a3e867978 100644
--- a/readthedocs/settings/base.py
+++ b/readthedocs/settings/base.py
@@ -266,6 +266,9 @@ def USE_PROMOS(self):  # noqa
         },
     }
 
+    # Sentry
+    SENTRY_CELERY_IGNORE_EXPECTED = True
+
     # Docker
     DOCKER_ENABLE = False
     DOCKER_IMAGE = 'readthedocs/build:2.0'