Mercurial > kallithea
changeset 5767:b76cdfccb5b8
db: name the scm_instance_cached cache entries - reduce the risk of collisions
- and same with other cache regions
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 14 Mar 2016 16:17:46 +0100 |
| parents | 041e8a5a2246 |
| children | 5cb780fd494d |
| files | kallithea/controllers/feed.py kallithea/controllers/summary.py kallithea/model/db.py |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/feed.py Mon Mar 14 16:17:46 2016 +0100 +++ b/kallithea/controllers/feed.py Mon Mar 14 16:17:46 2016 +0100 @@ -117,7 +117,7 @@ def atom(self, repo_name): """Produce an atom-1.0 feed via feedgenerator module""" - @cache_region('long_term') + @cache_region('long_term', '_get_feed_from_cache') def _get_feed_from_cache(key, kind): feed = Atom1Feed( title=self.title % repo_name, @@ -142,13 +142,13 @@ kind = 'ATOM' valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_feed_from_cache, None, repo_name, kind) + region_invalidate(_get_feed_from_cache, None, '_get_feed_from_cache', 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') + @cache_region('long_term', '_get_feed_from_cache') def _get_feed_from_cache(key, kind): feed = Rss201rev2Feed( title=self.title % repo_name, @@ -173,5 +173,5 @@ kind = 'RSS' valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_feed_from_cache, None, repo_name, kind) + region_invalidate(_get_feed_from_cache, None, '_get_feed_from_cache', repo_name, kind) return _get_feed_from_cache(repo_name, kind)
--- a/kallithea/controllers/summary.py Mon Mar 14 16:17:46 2016 +0100 +++ b/kallithea/controllers/summary.py Mon Mar 14 16:17:46 2016 +0100 @@ -71,7 +71,7 @@ repo_name = db_repo.repo_name log.debug('Looking for README file') - @cache_region('long_term') + @cache_region('long_term', '_get_readme_from_cache') def _get_readme_from_cache(key, kind): readme_data = None readme_file = None @@ -105,7 +105,7 @@ kind = 'README' valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_readme_from_cache, None, repo_name, kind) + region_invalidate(_get_readme_from_cache, None, '_get_readme_from_cache', repo_name, kind) return _get_readme_from_cache(repo_name, kind) @LoginRequired()
--- a/kallithea/model/db.py Mon Mar 14 16:17:46 2016 +0100 +++ b/kallithea/model/db.py Mon Mar 14 16:17:46 2016 +0100 @@ -1446,7 +1446,7 @@ return self.__get_instance() def scm_instance_cached(self, valid_cache_keys=None): - @cache_region('long_term') + @cache_region('long_term', 'scm_instance_cached') def _c(repo_name): # repo_name is just for the cache key log.debug('Creating new %s scm_instance and populating cache', repo_name) return self.scm_instance_no_cache() @@ -1455,7 +1455,7 @@ 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) + region_invalidate(_c, None, 'scm_instance_cached', rn) else: log.debug('Trying to get scm_instance of %s from cache', rn) return _c(rn)