engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

permissions: enable caching by controlling short_term cache settings.

Browse source
This commit is contained in:
Marcin Kuzminski 2018-06-15 19:36:19 +02:00
parent bfbb9e33a4
commit e0b621ed56
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configs/development.ini
View file

@ -326,8 +326,9 @@ beaker.cache.super_short_term.type = memory
beaker.cache.super_short_term.expire = 10
beaker.cache.super_short_term.key_length = 256
beaker.cache.short_term.type = memory
beaker.cache.short_term.expire = 60
# used for caching user permissions
beaker.cache.short_term.type = file
beaker.cache.short_term.expire = 0
beaker.cache.short_term.key_length = 256
beaker.cache.long_term.type = memory

5
configs/production.ini
View file

@ -301,8 +301,9 @@ beaker.cache.super_short_term.type = memory
beaker.cache.super_short_term.expire = 10
beaker.cache.super_short_term.key_length = 256
beaker.cache.short_term.type = memory
beaker.cache.short_term.expire = 60
# used for caching user permissions
beaker.cache.short_term.type = file
beaker.cache.short_term.expire = 0
beaker.cache.short_term.key_length = 256
beaker.cache.long_term.type = memory

12
rhodecode/lib/auth.py
View file

@ -48,7 +48,7 @@ from rhodecode.model.db import (
User, Repository, Permission, UserToPerm, UserGroupToPerm, UserGroupMember,
UserIpMap, UserApiKeys, RepoGroup, UserGroup)
from rhodecode.lib import caches
from rhodecode.lib.utils2 import safe_unicode, aslist, safe_str, md5
from rhodecode.lib.utils2 import safe_unicode, aslist, safe_str, md5, safe_int
from rhodecode.lib.utils import (
get_repo_slug, get_repo_group_slug, get_user_group_slug)
from rhodecode.lib.caching_query import FromCache
@ -1070,10 +1070,16 @@ class AuthUser(object):
# inheritance of global permissions like create repo/fork repo etc
user_inherit_default_permissions = user.inherit_default_permissions
log.debug('Computing PERMISSION tree for scope %s' % (scope, ))
cache_seconds = safe_int(
rhodecode.CONFIG.get('beaker.cache.short_term.expire'))
cache_on = cache or cache_seconds > 0
log.debug(
'Computing PERMISSION tree for scope `%s` with caching: %s' % (
scope, cache_on))
compute = caches.conditional_cache(
'short_term', 'cache_desc',
condition=cache, func=_cached_perms_data)
condition=cache_on, func=_cached_perms_data)
result = compute(user_id, scope, user_is_admin,
user_inherit_default_permissions, explicit, algo,
calculate_super_admin)

4
rhodecode/tests/rhodecode.ini
View file

@ -298,8 +298,8 @@ beaker.cache.super_short_term.type = memory
beaker.cache.super_short_term.expire = 1
beaker.cache.super_short_term.key_length = 256
beaker.cache.short_term.type = memory
beaker.cache.short_term.expire = 60
beaker.cache.short_term.type = file
beaker.cache.short_term.expire = 0
beaker.cache.short_term.key_length = 256
beaker.cache.long_term.type = memory