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 2e7c62029948dc928bd37cc9e67389764e301ecf..2a132c98b2d860b67fc682767761494e7b39aae6 100644 |
--- a/chrome/common/extensions/docs/server2/cron_servlet.py |
+++ b/chrome/common/extensions/docs/server2/cron_servlet.py |
@@ -14,6 +14,7 @@ from caching_file_system import CachingFileSystem |
from compiled_file_system import CompiledFileSystem |
from empty_dir_file_system import EmptyDirFileSystem |
from github_file_system import GithubFileSystem |
+from host_file_system_creator import HostFileSystemCreator |
from object_store_creator import ObjectStoreCreator |
from render_servlet import RenderServlet |
from server_instance import ServerInstance |
@@ -43,6 +44,9 @@ class CronServlet(Servlet): |
def CreateBranchUtility(self, object_store_creator): |
return BranchUtility.Create(object_store_creator) |
+ def CreateHostFileSystem(self, branch): |
+ return SubversionFileSystem.Create(branch) |
+ |
def CreateHostFileSystemForBranchAndRevision(self, branch, revision): |
return SubversionFileSystem.Create(branch, revision=revision) |
@@ -188,7 +192,7 @@ class CronServlet(Servlet): |
def GetHostFileSystemForRevision(self, revision): |
return delegate.CreateHostFileSystemForBranchAndRevision( |
get_branch_for_channel(channel), |
- revision) |
+ revision=revision) |
app_yaml_handler = AppYamlHelper( |
svn_constants.APP_YAML_PATH, |
@@ -221,11 +225,31 @@ class CronServlet(Servlet): |
def _CreateServerInstance(self, channel, revision): |
object_store_creator = self._CreateObjectStoreCreator(channel) |
+ branch_utility = self._delegate.CreateBranchUtility(object_store_creator) |
+ host_file_system_creator = HostFileSystemCreator( |
+ branch_utility, |
+ self._delegate.CreateHostFileSystem, |
+ object_store_creator, |
+ offline=False) |
not at google - send to devlin
2013/07/09 23:11:55
False should be the default here so you can leave
epeterson
2013/07/16 00:28:23
Done.
|
+ # Using HostFileSystemCreator |
not at google - send to devlin
2013/07/09 23:11:55
yep let's use it
epeterson
2013/07/16 00:28:23
Done.
|
+ ''' |
+ host_file_system = host_file_system_creator.CreateAtBranch( |
+ branch_utility.GetChannelInfo(channel).branch) |
+ ''' |
+ # CreateHostFileSystemForBranchAndRevision |
host_file_system = CachingFileSystem( |
self._delegate.CreateHostFileSystemForBranchAndRevision( |
self._GetBranchForChannel(channel), |
revision), |
object_store_creator) |
+ # Using only CreateHostFileSystem |
+ ''' |
+ host_file_system = CachingFileSystem( |
+ self._delegate.CreateHostFileSystem( |
+ self._GetBranchForChannel(channel), |
+ revision=revision), |
+ object_store_creator) |
+ ''' |
app_samples_file_system = self._delegate.CreateAppSamplesFileSystem( |
object_store_creator) |
compiled_host_fs_factory = CompiledFileSystem.Factory( |
@@ -236,4 +260,6 @@ class CronServlet(Servlet): |
host_file_system, |
app_samples_file_system, |
'' if channel == 'stable' else '/%s' % channel, |
- compiled_host_fs_factory) |
+ compiled_host_fs_factory, |
+ branch_utility, |
+ host_file_system_creator) |