chrome/common/extensions/docs/server2/server_instance.py - Issue 14267024: Devserver: have a separate ObjectStore namespace (both memcache and datastore)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/docs/server2/server_instance.py

Issue 14267024: Devserver: have a separate ObjectStore namespace (both memcache and datastore) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove _CheckVersions Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/extensions/docs/server2/samples_data_source.py ('k') | chrome/common/extensions/docs/server2/sidenav_data_source.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/server2/server_instance.py

diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py

index 54550b3c8b7ec3880264dc8d189523bd61824860..b2b059e705f5181b937145bd9f9fabd5247c2e3d 100644

--- a/chrome/common/extensions/docs/server2/server_instance.py

+++ b/chrome/common/extensions/docs/server2/server_instance.py

@@ -11,6 +11,7 @@ from api_data_source import APIDataSource

from api_list_data_source import APIListDataSource

from appengine_blobstore import AppEngineBlobstore

from appengine_url_fetcher import AppEngineUrlFetcher

+from appengine_wrappers import GetAppVersion

from branch_utility import BranchUtility

from caching_file_system import CachingFileSystem

from compiled_file_system import CompiledFileSystem

@@ -51,7 +52,8 @@ class ServerInstance(object):

'''

branch_utility = ServerInstance._GetOrCreateBranchUtility()

branch = branch_utility.GetBranchNumberForChannelName(channel)

- object_store_creator_factory = ObjectStoreCreator.Factory(branch)

+ object_store_creator_factory = ObjectStoreCreator.Factory(GetAppVersion(),

+ branch)

# No svn nor github file systems. Rely on the crons to fill the caches, and

# for the caches to exist.

return ServerInstance(

@@ -87,7 +89,8 @@ class ServerInstance(object):

viewvc_url = svn_url.replace(url_constants.SVN_URL,

url_constants.VIEWVC_URL)

- object_store_creator_factory = ObjectStoreCreator.Factory(branch)

+ object_store_creator_factory = ObjectStoreCreator.Factory(GetAppVersion(),

+ branch)

svn_file_system = CachingFileSystem(

SubversionFileSystem(AppEngineUrlFetcher(svn_url),

@@ -102,7 +105,7 @@ class ServerInstance(object):

@staticmethod

def CreateForTest(file_system):

return ServerInstance('test',

- ObjectStoreCreator.Factory('test'),

+ ObjectStoreCreator.TestFactory(),

file_system,

None)