Clean up other broadcasting failures

Author: ericholscher

readthedocs/builds/models.py

@@ -163,7 +163,7 @@ def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
     def delete(self, *args, **kwargs):  # pylint: disable=arguments-differ
         from readthedocs.projects import tasks
         log.info('Removing files for version %s', self.slug)
-        tasks.clear_artifacts.delay(version_pk=self.pk)
+        broadcast(type='app', task=tasks.clear_artifacts, args=[self.pk])
         broadcast(type='app', task=tasks.symlink_project, args=[self.project.pk])
         super(Version, self).delete(*args, **kwargs)
 

readthedocs/core/utils/__init__.py

@@ -28,20 +28,6 @@
 SYNC_USER = getattr(settings, 'SYNC_USER', getpass.getuser())
 
 
-def run_on_app_servers(command):
-    """A helper to copy a single file across app servers"""
-    log.info("Running %s on app servers", command)
-    ret_val = 0
-    if getattr(settings, "MULTIPLE_APP_SERVERS", None):
-        for server in settings.MULTIPLE_APP_SERVERS:
-            ret = os.system("ssh %s@%s %s" % (SYNC_USER, server, command))
-            if ret != 0:
-                ret_val = ret
-        return ret_val
-    ret = os.system(command)
-    return ret
-
-
 def broadcast(type, task, args, kwargs=None):  # pylint: disable=redefined-builtin
     assert type in ['web', 'app', 'build']
     default_queue = getattr(settings, 'CELERY_DEFAULT_QUEUE', 'celery')

readthedocs/projects/tasks.py

@@ -554,9 +554,9 @@ def finish_build(version_pk, build_pk, hostname=None, html=False,
         version.save()
 
     if not pdf:
-        clear_pdf_artifacts(version)
+        broadcast(type='app', task=clear_pdf_artifacts, args=[version.pk])
     if not epub:
-        clear_epub_artifacts(version)
+        broadcast(type='app', task=clear_epub_artifacts, args=[version.pk])
 
     # Sync files to the web servers
     broadcast(type='app', task=move_files, args=[version_pk, hostname],
@@ -909,7 +909,6 @@ def remove_dir(path):
     shutil.rmtree(path, ignore_errors=True)
 
 
-@task(queue='web')
 def clear_artifacts(version_pk):
     """Remove artifacts from the web servers"""
     version = Version.objects.get(pk=version_pk)
@@ -920,33 +919,19 @@ def clear_artifacts(version_pk):
 
 
 def clear_pdf_artifacts(version):
-    run_on_app_servers('rm -rf %s'
-                       % version.project.get_production_media_path(
-                           type_='pdf', version_slug=version.slug))
+    remove_dir(version.project.get_production_media_path(
+        type_='pdf', version_slug=version.slug))
 
 
 def clear_epub_artifacts(version):
-    run_on_app_servers('rm -rf %s'
-                       % version.project.get_production_media_path(
-                           type_='epub', version_slug=version.slug))
+    remove_dir(version.project.get_production_media_path(
+        type_='epub', version_slug=version.slug))
 
 
 def clear_htmlzip_artifacts(version):
-    run_on_app_servers('rm -rf %s'
-                       % version.project.get_production_media_path(
-                           type_='htmlzip', version_slug=version.slug))
+    remove_dir(version.project.get_production_media_path(
+        type_='htmlzip', version_slug=version.slug))
 
 
 def clear_html_artifacts(version):
-    run_on_app_servers('rm -rf %s' % version.project.rtd_build_path(version=version.slug))
-
-
-@task(queue='web')
-def remove_path_from_web(path):
-    """Remove the given path from the web servers file system."""
-    # Santity check  for spaces in the path since spaces would result in
-    # deleting unpredictable paths with "rm -rf".
-    assert ' ' not in path, "No spaces allowed in path"
-
-    # TODO: We need some proper escaping here for the given path.
-    run_on_app_servers('rm -rf {path}'.format(path=path))
+    remove_dir(version.project.rtd_build_path(version=version.slug))