kallithea Changeset - b5e59e2b5cfe

Changeset - b5e59e2b5cfe

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 16 years ago 2010-05-09 15:06:00
marcin@python-works.com

moved cache invalidating to utils, as seperate function. Implemented invalidating in

3 files changed with 16 insertions and 4 deletions:

pylons_app/controllers/admin.py

pylons_app/controllers/repos.py

pylons_app/lib/utils.py

0 comments (0 inline, 0 general)

pylons_app/controllers/admin.py

➞

Show inline comments

 import logging
 import os
 from pylons import request, response, session, tmpl_context as c, url, app_globals as g
 from pylons.controllers.util import abort, redirect
 from beaker.cache import region_invalidate
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib import auth
 from pylons_app.model.forms import LoginForm
 import formencode
 import formencode.htmlfill as htmlfill
 from pylons_app.model import meta
 from pylons_app.model.db import Users, UserLogs
 from webhelpers.paginate import Page
 from pylons_app.lib.utils import check_repo
 from pylons_app.lib.utils import check_repo, invalidate_cache
 log = logging.getLogger(__name__)
 class AdminController(BaseController):
     def __before__(self):
         c.admin_user = session.get('admin_user', False)
@@ @@ -78,15 +78,14 @@ class AdminController(BaseController): @@
         new_repo = new_repo.replace("-", "_")
         try:
             self._create_repo(new_repo)
             c.new_repo = new_repo
             c.msg = 'added repo'
             from pylons_app.lib.base import _get_repos
             #clear our cached list for refresh with new repo
-            region_invalidate(_get_repos, None, 'repo_list_2')
+            invalidate_cache('repo_list_2')
         except Exception as e:
             c.new_repo = 'Exception when adding: %s' % new_repo
             c.msg = str(e)
         return render('admin/add.html')

pylons_app/controllers/repos.py

➞

Show inline comments

@@ @@ -7,12 +7,13 @@ from pylons_app.lib.base import BaseCont @@
 from pylons_app.model import meta
 from pylons_app.model.db import Users, UserLogs
 from pylons_app.lib.auth import authenticate
 from pylons_app.model.hg_model import HgModel
 from operator import itemgetter
 import shutil
 from pylons_app.lib.utils import invalidate_cache
 log = logging.getLogger(__name__)
 class ReposController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
@@ @@ -61,12 +62,16 @@ class ReposController(BaseController): @@
         from datetime import datetime
         path = g.paths[0][1].replace('*', '')
         rm_path = os.path.join(path, id)
         log.info("Removing %s", rm_path)
         shutil.move(os.path.join(rm_path, '.hg'), os.path.join(rm_path, 'rm__.hg'))
         shutil.move(rm_path, os.path.join(path, 'rm__%s-%s' % (datetime.today(), id)))
         #clear our cached list for refresh with new repo
         invalidate_cache('repo_list_2')
         return redirect(url('repos'))
     def show(self, id, format='html'):
         """GET /repos/id: Show a specific item"""
         # url('repo', id=ID)

pylons_app/lib/utils.py

➞

Show inline comments

@@ @@ -87,12 +87,20 @@ def make_ui(path='hgwebdir.config', chec @@
     for section in sections:
         for k, v in cfg.items(section):
             baseui.setconfig(section, k, v)
     return baseui
 def invalidate_cache(name):
     from beaker.cache import region_invalidate
     if name == 'repo_list_2':
         log.info('INVALIDATING CACHE FOR %s', name)
         from pylons_app.lib.base import _get_repos
         #clear our cached list for refresh with new repo
         region_invalidate(_get_repos, None, 'repo_list_2')
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
 class EmptyChangeset(BaseChangeset):
     revision = -1

0 comments (0 inline, 0 general)