Merge pull request #5678 from stsewd/fix-bug-in-notifications

Fix bug in notifications

Author: stsewd

readthedocs/projects/tasks.py

@@ -387,7 +387,7 @@ def run(
                 return False
 
         # Catch unhandled errors in the setup step
-        except Exception as e:  # noqa
+        except Exception:
             log.exception(
                 'An unhandled exception was raised during build setup',
                 extra={
@@ -411,14 +411,14 @@ def run(
                 self.setup_env.update_build(BUILD_STATE_FINISHED)
 
             # Send notifications for unhandled errors
-            self.send_notifications()
+            self.send_notifications(version_pk, build_pk)
             return False
         else:
             # No exceptions in the setup step, catch unhandled errors in the
             # build steps
             try:
                 self.run_build(docker=docker, record=record)
-            except Exception as e:  # noqa
+            except Exception:
                 log.exception(
                     'An unhandled exception was raised during project build',
                     extra={
@@ -439,7 +439,7 @@ def run(
                     self.build_env.update_build(BUILD_STATE_FINISHED)
 
                 # Send notifications for unhandled errors
-                self.send_notifications()
+                self.send_notifications(version_pk, build_pk)
                 return False
 
         return True
@@ -497,7 +497,7 @@ def run_setup(self, record=True):
             # triggered before the previous one has finished (e.g. two webhooks,
             # one after the other)
             if not isinstance(self.setup_env.failure, VersionLockedError):
-                self.send_notifications()
+                self.send_notifications(self.version.pk, self.build['id'])
 
             return False
 
@@ -566,15 +566,14 @@ def run_build(self, docker, record):
                 # TODO the build object should have an idea of these states,
                 # extend the model to include an idea of these outcomes
                 outcomes = self.build_docs()
-                build_id = self.build.get('id')
             except vcs_support_utils.LockTimeout as e:
                 self.task.retry(exc=e, throw=False)
                 raise VersionLockedError
             except SoftTimeLimitExceeded:
                 raise BuildTimeoutError
 
             # Finalize build and update web servers
-            if build_id:
+            if self.build.get('id'):
                 self.update_app_instances(
                     html=bool(outcomes['html']),
                     search=bool(outcomes['search']),
@@ -586,7 +585,7 @@ def run_build(self, docker, record):
                 log.warning('No build ID, not syncing files')
 
         if self.build_env.failed:
-            self.send_notifications()
+            self.send_notifications(self.version.pk, self.build['id'])
 
         build_complete.send(sender=Build, build=self.build_env.build)
 
@@ -920,9 +919,9 @@ def build_docs_class(self, builder_class):
         builder.move()
         return success
 
-    def send_notifications(self):
+    def send_notifications(self, version_pk, build_pk):
         """Send notifications on build failure."""
-        send_notifications.delay(self.version.pk, build_pk=self.build['id'])
+        send_notifications.delay(version_pk, build_pk=build_pk)
 
     def is_type_sphinx(self):
         """Is documentation type Sphinx."""