| Index: chrome/common/extensions/docs/server2/cron_servlet.py
|
| diff --git a/chrome/common/extensions/docs/server2/cron_servlet.py b/chrome/common/extensions/docs/server2/cron_servlet.py
|
| index b4676f5b4a1091bdbd74fee8221349607bc97732..57c68e444f10398aee1c0ca4ff53400f1ae5b3a1 100644
|
| --- a/chrome/common/extensions/docs/server2/cron_servlet.py
|
| +++ b/chrome/common/extensions/docs/server2/cron_servlet.py
|
| @@ -96,9 +96,8 @@ class CronServlet(Servlet):
|
|
|
| def CreateHostFileSystemProvider(self,
|
| object_store_creator,
|
| - max_trunk_revision=None):
|
| - return HostFileSystemProvider(object_store_creator,
|
| - max_trunk_revision=max_trunk_revision)
|
| + pinned_commit=None):
|
| + return HostFileSystemProvider(object_store_creator, pinned_commit)
|
|
|
| def CreateGithubFileSystemProvider(self, object_store_creator):
|
| return GithubFileSystemProvider(object_store_creator)
|
| @@ -140,7 +139,7 @@ class CronServlet(Servlet):
|
| # TODO(kalman): IMPORTANT. This sometimes throws an exception, breaking
|
| # everything. Need retry logic at the fetcher level.
|
| server_instance = self._GetSafeServerInstance()
|
| - trunk_fs = server_instance.host_file_system_provider.GetTrunk()
|
| + trunk_fs = server_instance.host_file_system_provider.GetMaster()
|
|
|
| def render(path):
|
| request = Request(path, self._request.host, self._request.headers)
|
| @@ -262,6 +261,7 @@ class CronServlet(Servlet):
|
| _cronlog.info('app version %s is out of date, safe is %s',
|
| delegate.GetAppVersion(), safe_revision)
|
|
|
| + # XXX(rockot): wat do?
|
| return self._CreateServerInstance(safe_revision)
|
|
|
| def _GetMostRecentRevision(self):
|
| @@ -270,18 +270,18 @@ class CronServlet(Servlet):
|
| change as the cron runs.
|
| '''
|
| head_fs = (
|
| - self._CreateServerInstance(None).host_file_system_provider.GetTrunk())
|
| - return head_fs.Stat('').version
|
| + self._CreateServerInstance(None).host_file_system_provider.GetMaster())
|
| + return head_fs.GetCommitID().Get()
|
|
|
| - def _CreateServerInstance(self, revision):
|
| - '''Creates a ServerInstance pinned to |revision|, or HEAD if None.
|
| + def _CreateServerInstance(self, commit):
|
| + '''Creates a ServerInstance pinned to |commit|, or HEAD if None.
|
| NOTE: If passed None it's likely that during the cron run patches will be
|
| submitted at HEAD, which may change data underneath the cron run.
|
| '''
|
| object_store_creator = ObjectStoreCreator(start_empty=True)
|
| branch_utility = self._delegate.CreateBranchUtility(object_store_creator)
|
| host_file_system_provider = self._delegate.CreateHostFileSystemProvider(
|
| - object_store_creator, max_trunk_revision=revision)
|
| + object_store_creator, pinned_commit=commit)
|
| github_file_system_provider = self._delegate.CreateGithubFileSystemProvider(
|
| object_store_creator)
|
| gcs_file_system_provider = self._delegate.CreateGCSFileSystemProvider(
|
|
|