Docserver: Run the ContentProviders Cron() method on a standard request if a

chrome/common/extensions/docs/server2/patch_servlet.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from fnmatch import fnmatch
 import logging
 from urlparse import urlparse
 
 from appengine_url_fetcher import AppEngineUrlFetcher
 from caching_file_system import CachingFileSystem
@@ skipping 42 matching lines @@
             # impossible to add files in the patches.
             offline=False,
             # The trunk file system for this creator should be the patched one.
             default_trunk_instance=patched_file_system))
 
     combined_compiled_fs_factory = ChainedCompiledFileSystem.Factory(
         [unpatched_file_system], object_store_creator)
 
     branch_utility = self._delegate.CreateBranchUtility(object_store_creator)
 
-    return ServerInstance(object_store_creator,
-                          combined_compiled_fs_factory,
-                          branch_utility,
-                          patched_host_file_system_provider,
-                          self._delegate.CreateGithubFileSystemProvider(
-                              object_store_creator),
-                          base_path='/_patch/%s/' % self._issue)
+    server_instance = ServerInstance(
+        object_store_creator,
+        combined_compiled_fs_factory,
+        branch_utility,
+        patched_host_file_system_provider,
+        self._delegate.CreateGithubFileSystemProvider(object_store_creator),
+        base_path='/_patch/%s/' % self._issue)
+
+    # HACK: if content_providers.json changes in this patch then the cron needs
+    # to be re-run to pull in the new configuration.
+    _, _, modified = rietveld_patcher.GetPatchedFiles()
+    if svn_constants.CONTENT_PROVIDERS_PATH in modified:
+      server_instance.content_providers.Cron().Get()
+
+    return server_instance
 
 class PatchServlet(Servlet):
   '''Servlet which renders patched docs.
   '''
   def __init__(self, request, delegate=None):
     self._request = request
     self._delegate = delegate or InstanceServlet.Delegate()
 
   def Get(self):
     if (not IsDevServer() and
@@ skipping 22 matching lines @@
       # Disable cache for patched content.
       response.headers.pop('cache-control', None)
     except RietveldPatcherError as e:
       response = Response.NotFound(e.message, {'Content-Type': 'text/plain'})
 
     redirect_url, permanent = response.GetRedirect()
     if redirect_url is not None:
       response = Response.Redirect('/_patch/%s%s' % (issue, redirect_url),
                                    permanent)
     return response