Fix email notifications on build failures

Author: agjohnson

readthedocs/projects/tasks.py

@@ -142,6 +142,9 @@ def run(self, pk, version_pk=None, build_pk=None, record=True, docker=False,
                     epub=outcomes['epub'],
                 )
 
+        if self.build_env.failed:
+            self.send_notifications()
+
     @staticmethod
     def get_project(project_pk):
         """
@@ -424,6 +427,14 @@ def build_docs_class(self, builder_class):
         builder.move()
         return success
 
+    def send_notifications(self):
+        """Send notifications on build failure
+
+        Don't send failure notices on ``stable`` version builds.
+        """
+        if self.version.slug != STABLE:
+            send_notifications.delay(self.version.pk, build_pk=self.build['id'])
+
 
 update_docs = celery_app.tasks[UpdateDocsTask.name]
 
@@ -543,8 +554,6 @@ def finish_build(version_pk, build_pk, hostname=None, html=False,
     update_static_metadata.delay(version.project.pk)
     fileify.delay(version.pk, commit=build.commit)
     update_search.delay(version.pk, commit=build.commit)
-    if not html and version.slug != STABLE and build.exit_code != 423:
-        send_notifications.delay(version.pk, build_pk=build.pk)
 
 
 @task(queue='web')

readthedocs/templates/projects/email/build_failed.html

@@ -9,8 +9,14 @@
 {% endblock %}
 
 {% block content %}
+  {% if build.error %}
+    <p>
+      Error: {{ build.error }}
+    </p>
+  {% endif %}
+
   <p>
-    You can see what went wrong here:
+    You can find out more about this failure here:
   </p>
 
   <p>

readthedocs/templates/projects/email/build_failed.txt

@@ -1,11 +1,11 @@
 {% extends "core/email/common.txt" %}
 {% block salutation %}Build Failed for {{ project.name }} ({{ version.verbose_name }}){% endblock %}
 {% block content %}
-
-
-
-
-You can see what went wrong here:
+{% if build.error %}
+Error:
+{{ build.error }}
+{% endif %}
+You can find out more about this failure here:
 {{ build_url }}
 
 If you have questions, a good place to start is the FAQ: