Mercurial > kallithea
changeset 3773:8e2cd46f765b beta
invalidate: encapsulate how key is generated from repo_name and kind
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 03 Apr 2013 15:56:12 +0200 |
| parents | 910ad1ffee99 |
| children | 60335b702a00 |
| files | rhodecode/controllers/feed.py rhodecode/controllers/summary.py rhodecode/lib/utils.py rhodecode/model/db.py |
| diffstat | 4 files changed, 21 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/feed.py Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/controllers/feed.py Wed Apr 03 15:56:12 2013 +0200 @@ -118,7 +118,7 @@ """Produce an atom-1.0 feed via feedgenerator module""" @cache_region('long_term') - def _get_feed_from_cache(key): + def _get_feed_from_cache(key, kind): feed = Atom1Feed( title=self.title % repo_name, link=url('summary_home', repo_name=repo_name, @@ -140,17 +140,17 @@ response.content_type = feed.mime_type return feed.writeString('utf-8') - key = repo_name + '_ATOM' - valid = CacheInvalidation.test_and_set_valid(key) + kind = 'ATOM' + valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_feed_from_cache, None, key) - return _get_feed_from_cache(key) + region_invalidate(_get_feed_from_cache, None, repo_name, kind) + return _get_feed_from_cache(repo_name, kind) def rss(self, repo_name): """Produce an rss2 feed via feedgenerator module""" @cache_region('long_term') - def _get_feed_from_cache(key): + def _get_feed_from_cache(key, kind): feed = Rss201rev2Feed( title=self.title % repo_name, link=url('summary_home', repo_name=repo_name, @@ -172,8 +172,8 @@ response.content_type = feed.mime_type return feed.writeString('utf-8') - key = repo_name + '_RSS' - valid = CacheInvalidation.test_and_set_valid(key) + kind = 'RSS' + valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_feed_from_cache, None, key) - return _get_feed_from_cache(key) + region_invalidate(_get_feed_from_cache, None, repo_name, kind) + return _get_feed_from_cache(repo_name, kind)
--- a/rhodecode/controllers/summary.py Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/controllers/summary.py Wed Apr 03 15:56:12 2013 +0200 @@ -92,7 +92,7 @@ repo_name = db_repo.repo_name @cache_region('long_term') - def _get_readme_from_cache(key): + def _get_readme_from_cache(key, kind): readme_data = None readme_file = None log.debug('Looking for README file') @@ -124,11 +124,11 @@ return readme_data, readme_file - key = repo_name + '_README' - valid = CacheInvalidation.test_and_set_valid(key) - if not valid: - region_invalidate(_get_readme_from_cache, None, key) - return _get_readme_from_cache(key) + kind = 'README' + valid = CacheInvalidation.test_and_set_valid(repo_name, kind) + if not valid: + region_invalidate(_get_readme_from_cache, None, repo_name, kind) + return _get_readme_from_cache(repo_name, kind) @LoginRequired() @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
--- a/rhodecode/lib/utils.py Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/lib/utils.py Wed Apr 03 15:56:12 2013 +0200 @@ -476,7 +476,7 @@ # system, this will register all repos and multiple instances cache_key = CacheInvalidation._get_cache_key(name) log.debug("Creating invalidation cache key for %s: %s", name, cache_key) - CacheInvalidation.test_and_set_valid(name) + CacheInvalidation.test_and_set_valid(name, None) sa.commit() removed = []
--- a/rhodecode/model/db.py Wed Apr 03 15:56:12 2013 +0200 +++ b/rhodecode/model/db.py Wed Apr 03 15:56:12 2013 +0200 @@ -1186,7 +1186,7 @@ return self.__get_instance() rn = self.repo_name - valid = CacheInvalidation.test_and_set_valid(rn, valid_cache_keys=valid_cache_keys) + valid = CacheInvalidation.test_and_set_valid(rn, None, valid_cache_keys=valid_cache_keys) if not valid: log.debug('Cache for %s invalidated, getting new object' % (rn)) region_invalidate(_c, None, rn) @@ -1828,22 +1828,19 @@ Session().rollback() @classmethod - def test_and_set_valid(cls, key, valid_cache_keys=None): + def test_and_set_valid(cls, repo_name, kind, valid_cache_keys=None): """ Mark this cache key as active and currently cached. Return True if the existing cache registration still was valid. Return False to indicate that it had been invalidated and caches should be refreshed. """ + + key = (repo_name + '_' + kind) if kind else repo_name cache_key = cls._get_cache_key(key) if valid_cache_keys and cache_key in valid_cache_keys: return True - repo_name = key - repo_name = remove_suffix(repo_name, '_README') - repo_name = remove_suffix(repo_name, '_RSS') - repo_name = remove_suffix(repo_name, '_ATOM') - try: inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar() if not inv_obj: