settings: reduce number of settings fetch since it uses locking for cache invalidation and is generally slow.
We anyway load it per-request so we can re-use this.
This commit is contained in:
parent
7afe163e23
commit
f7627b4904
4 changed files with 9 additions and 5 deletions
|
|
@ -68,7 +68,8 @@ class AdminPermissionsView(BaseAppView, DataGridAppView):
|
|||
|
||||
c.user = User.get_default_user(refresh=True)
|
||||
|
||||
app_settings = SettingsModel().get_all_settings()
|
||||
app_settings = c.rc_config
|
||||
|
||||
defaults = {
|
||||
'anonymous': c.user.active,
|
||||
'default_register_message': app_settings.get(
|
||||
|
|
|
|||
|
|
@ -445,7 +445,7 @@ class AdminSettingsView(BaseAppView):
|
|||
def settings_issuetracker(self):
|
||||
c = self.load_default_context()
|
||||
c.active = 'issuetracker'
|
||||
defaults = SettingsModel().get_all_settings()
|
||||
defaults = c.rc_config
|
||||
|
||||
entry_key = 'rhodecode_issuetracker_pat_'
|
||||
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@ def attach_context_attributes(context, request, user_id=None):
|
|||
config = request.registry.settings
|
||||
|
||||
rc_config = SettingsModel().get_all_settings(cache=True)
|
||||
|
||||
context.rc_config = rc_config
|
||||
context.rhodecode_version = rhodecode.__version__
|
||||
context.rhodecode_edition = config.get('rhodecode.edition')
|
||||
# unique secret + version does not leak the version but keep consistency
|
||||
|
|
|
|||
|
|
@ -2246,8 +2246,12 @@ class Repository(Base, BaseModel):
|
|||
del override['ssh']
|
||||
|
||||
# we didn't override our tmpl from **overrides
|
||||
request = get_current_request()
|
||||
if not uri_tmpl:
|
||||
rc_config = SettingsModel().get_all_settings(cache=True)
|
||||
if hasattr(request, 'call_context') and hasattr(request.call_context, 'rc_config'):
|
||||
rc_config = request.call_context.rc_config
|
||||
else:
|
||||
rc_config = SettingsModel().get_all_settings(cache=True)
|
||||
if ssh:
|
||||
uri_tmpl = rc_config.get(
|
||||
'rhodecode_clone_uri_ssh_tmpl') or self.DEFAULT_CLONE_URI_SSH
|
||||
|
|
@ -2255,7 +2259,6 @@ class Repository(Base, BaseModel):
|
|||
uri_tmpl = rc_config.get(
|
||||
'rhodecode_clone_uri_tmpl') or self.DEFAULT_CLONE_URI
|
||||
|
||||
request = get_current_request()
|
||||
return get_clone_url(request=request,
|
||||
uri_tmpl=uri_tmpl,
|
||||
repo_name=self.repo_name,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue