| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import logging | 5 import logging |
| 6 import time | 6 import time |
| 7 import traceback | 7 import traceback |
| 8 | 8 |
| 9 from app_yaml_helper import AppYamlHelper | 9 from app_yaml_helper import AppYamlHelper |
| 10 from appengine_wrappers import ( | 10 from appengine_wrappers import ( |
| 11 GetAppVersion, DeadlineExceededError, IsDevServer, logservice) | 11 GetAppVersion, DeadlineExceededError, IsDevServer, logservice) |
| 12 from branch_utility import BranchUtility | 12 from branch_utility import BranchUtility |
| 13 from caching_file_system import CachingFileSystem | 13 from caching_file_system import CachingFileSystem |
| 14 from compiled_file_system import CompiledFileSystem |
| 14 from empty_dir_file_system import EmptyDirFileSystem | 15 from empty_dir_file_system import EmptyDirFileSystem |
| 15 from github_file_system import GithubFileSystem | 16 from github_file_system import GithubFileSystem |
| 16 from object_store_creator import ObjectStoreCreator | 17 from object_store_creator import ObjectStoreCreator |
| 17 from render_servlet import RenderServlet | 18 from render_servlet import RenderServlet |
| 18 from server_instance import ServerInstance | 19 from server_instance import ServerInstance |
| 19 from servlet import Servlet, Request, Response | 20 from servlet import Servlet, Request, Response |
| 20 from subversion_file_system import SubversionFileSystem | 21 from subversion_file_system import SubversionFileSystem |
| 21 import svn_constants | 22 import svn_constants |
| 22 from third_party.json_schema_compiler.memoize import memoize | 23 from third_party.json_schema_compiler.memoize import memoize |
| 23 | 24 |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 | 221 |
| 221 def _CreateServerInstance(self, channel, revision): | 222 def _CreateServerInstance(self, channel, revision): |
| 222 object_store_creator = self._CreateObjectStoreCreator(channel) | 223 object_store_creator = self._CreateObjectStoreCreator(channel) |
| 223 host_file_system = CachingFileSystem( | 224 host_file_system = CachingFileSystem( |
| 224 self._delegate.CreateHostFileSystemForBranchAndRevision( | 225 self._delegate.CreateHostFileSystemForBranchAndRevision( |
| 225 self._GetBranchForChannel(channel), | 226 self._GetBranchForChannel(channel), |
| 226 revision), | 227 revision), |
| 227 object_store_creator) | 228 object_store_creator) |
| 228 app_samples_file_system = self._delegate.CreateAppSamplesFileSystem( | 229 app_samples_file_system = self._delegate.CreateAppSamplesFileSystem( |
| 229 object_store_creator) | 230 object_store_creator) |
| 231 compiled_host_fs_factory = CompiledFileSystem.Factory( |
| 232 host_file_system, |
| 233 object_store_creator) |
| 230 return ServerInstance(channel, | 234 return ServerInstance(channel, |
| 231 object_store_creator, | 235 object_store_creator, |
| 232 host_file_system, | 236 host_file_system, |
| 233 app_samples_file_system) | 237 app_samples_file_system, |
| 238 '/static' if channel == 'stable' else |
| 239 '/%s/static' % channel, |
| 240 compiled_host_fs_factory) |
| OLD | NEW |