Clean up logic around how we delete files for deleted projects and inactive versions

readthedocs/builds/forms.py

@@ -1,8 +1,14 @@
+import logging
+
 from django import forms
 
 from readthedocs.builds.models import VersionAlias, Version
-from readthedocs.projects.models import Project
 from readthedocs.core.utils import trigger_build
+from readthedocs.projects.models import Project
+from readthedocs.projects.tasks import clear_artifacts
+
+
+log = logging.getLogger(__name__)
 
 
 class AliasForm(forms.ModelForm):
@@ -33,3 +39,12 @@ def save(self, *args, **kwargs):
         obj = super(VersionForm, self).save(*args, **kwargs)
         if obj.active and not obj.built and not obj.uploaded:
             trigger_build(project=obj.project, version=obj)
+
+    def clean(self):
+        cleaned_data = super(VersionForm, self).clean()
+        if self.instance.pk is not None:  # new instance only
+            if self.instance.active is True and cleaned_data['active'] is False:
+                log.info('Removing files for version %s' % self.instance.slug)
+                clear_artifacts.delay(version_pk=self.instance.pk)
+                self.instance.built = False
+        return cleaned_data

readthedocs/builds/models.py

@@ -18,6 +18,7 @@
                                             REPO_TYPE_HG, GITHUB_URL,
                                             GITHUB_REGEXS, BITBUCKET_URL,
                                             BITBUCKET_REGEXS)
+from readthedocs.projects.tasks import clear_artifacts
 
 from .constants import (BUILD_STATE, BUILD_TYPES, VERSION_TYPES,
                         LATEST, NON_REPOSITORY_VERSIONS, STABLE,
@@ -158,6 +159,12 @@ def save(self, *args, **kwargs):
         self.project.sync_supported_versions()
         return obj
 
+    def delete(self, *args, **kwargs):
+        log.info('Removing files for version %s' % self.slug)
+        clear_artifacts.delay(version_pk=self.pk)
+        super(Version, self).delete(*args, **kwargs)
+
+
     @property
     def identifier_friendly(self):
         '''Return display friendly identifier'''

readthedocs/projects/views/private.py

@@ -7,6 +7,7 @@
 from django.contrib.auth.models import User
 from django.contrib import messages
 from django.core.urlresolvers import reverse
+from django.conf import settings
 from django.http import HttpResponseRedirect, HttpResponseNotAllowed, Http404
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, render_to_response, render
@@ -35,7 +36,7 @@
 from readthedocs.projects.models import Project, EmailHook, WebHook, Domain
 from readthedocs.projects.views.base import ProjectAdminMixin
 from readthedocs.projects import constants, tasks
-from readthedocs.projects.tasks import remove_path_from_web
+from readthedocs.projects.tasks import remove_dir
 
 
 from readthedocs.projects.signals import project_import
@@ -220,8 +221,14 @@ def project_delete(request, project_slug):
                                 slug=project_slug)
 
     if request.method == 'POST':
-        # Remove the repository checkout
-        remove_path_from_web.delay(path=project.doc_path)
+        # Support hacky "broadcast" with MULTIPLE_APP_SERVERS setting,
+        # otherwise put in normal celery queue
+        for server in getattr(settings, "MULTIPLE_APP_SERVERS", ['celery']):
+            log.info('Removing files on %s' % server)
+            remove_dir.apply_async(
+                args=[project.doc_path],
+                queue=server,
+            )
 
         # Delete the project and everything related to it
         project.delete()