Move static media syncing to a broadcast

Author: ericholscher

readthedocs/core/management/commands/set_metadata.py

@@ -7,6 +7,7 @@
 
 from readthedocs.projects import tasks
 from readthedocs.projects.models import Project
+from readthedocs.core.utils import broadcast
 
 log = logging.getLogger(__name__)
 
@@ -20,6 +21,6 @@ def handle(self, *args, **options):
         for p in queryset:
             log.info("Generating metadata for %s", p)
             try:
-                tasks.update_static_metadata(p.pk)
+                broadcast(type='app', task=tasks.update_static_metadata, args=[p.pk])
             except Exception:
                 log.error('Build failed for %s', p, exc_info=True)

readthedocs/projects/models.py

@@ -25,7 +25,7 @@
 from readthedocs.projects import constants
 from readthedocs.projects.exceptions import ProjectImportError
 from readthedocs.projects.templatetags.projects_tags import sort_version_aware
-from readthedocs.projects.utils import make_api_version, update_static_metadata
+from readthedocs.projects.utils import make_api_version
 from readthedocs.projects.version_handling import determine_stable_version
 from readthedocs.projects.version_handling import version_windows
 from readthedocs.core.resolver import resolve, resolve_domain
@@ -330,7 +330,8 @@ def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
         except Exception:
             log.error('failed to symlink project', exc_info=True)
         try:
-            update_static_metadata(project_pk=self.pk)
+            if not first_save:
+                broadcast(type='app', task=tasks.update_static_metadata, args=[self.pk])
         except Exception:
             log.error('failed to update static metadata', exc_info=True)
         try:

readthedocs/projects/tasks.py

@@ -558,6 +558,7 @@ def finish_build(version_pk, build_pk, hostname=None, html=False,
     if not epub:
         clear_epub_artifacts(version)
 
+    # Sync files to the web servers
     broadcast(type='app', task=move_files, args=[version_pk, hostname],
               kwargs=dict(
                   html=html,
@@ -570,8 +571,10 @@ def finish_build(version_pk, build_pk, hostname=None, html=False,
     # Symlink project on every web
     broadcast(type='app', task=symlink_project, args=[version.project.pk])
 
+    # Update metadata
+    broadcast(type='app', task=update_static_metadata, args=[version.project.pk])
+
     # Delayed tasks
-    update_static_metadata.delay(version.project.pk)
     fileify.delay(version.pk, commit=build.commit)
     update_search.delay(version.pk, commit=build.commit)
 
@@ -885,7 +888,6 @@ def update_static_metadata(project_pk, path=None):
         fh = open(path, 'w+')
         json.dump(metadata, fh)
         fh.close()
-        Syncer.copy(path, path, host=socket.gethostname(), is_file=True)
     except (AttributeError, IOError) as e:
         log.debug(LOG_TEMPLATE.format(
             project=project.slug,

readthedocs/projects/utils.py

@@ -29,12 +29,6 @@ def version_from_slug(slug, version):
     return v
 
 
-def update_static_metadata(project_pk):
-    """This is here to avoid circular imports in models.py"""
-    from readthedocs.projects import tasks
-    tasks.update_static_metadata.delay(project_pk)
-
-
 def find_file(filename):
     """Recursively find matching file from the current working path