kallithea Changeset - cf00e8d39f22

Changeset - cf00e8d39f22

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 13 years ago 2013-01-31 01:51:42
marcin@python-works.com

Grafted from: c2bf0fa7b3cb

git hook handler shouldn't ever use cache instances
- moved cache invalidation into finally block so we invalidate at latest possible stage
- added scm_instance_no_cache property to get non cached scm instances always

4 files changed with 18 insertions and 7 deletions:

rhodecode/lib/hooks.py

rhodecode/lib/middleware/simplegit.py

rhodecode/lib/middleware/simplehg.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/lib/hooks.py

➞

Show inline comments

@@ @@ -379,13 +379,18 @@ def handle_git_receive(repo_path, revs, @@
                       % (safe_str(repo_path)))
     _hooks = dict(baseui.configitems('hooks')) or {}
     for k, v in extras.items():
         baseui.setconfig('rhodecode_extras', k, v)
     repo = repo.scm_instance
     if hook_type == 'pre':
         repo = repo.scm_instance
     else:
         #post push shouldn't use the cached instance never
         repo = repo.scm_instance_no_cache
     repo.ui = baseui
     if hook_type == 'pre':
         pre_push(baseui, repo)
     # if push hook is enabled via web interface

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -226,25 +226,26 @@ class SimpleGit(BaseVCSController): @@
         log.debug('HOOKS extras is %s' % extras)
         baseui = make_ui('db')
         self.__inject_extras(repo_path, baseui, extras)
         try:
             self._handle_githooks(repo_name, action, baseui, environ)
             # invalidate cache on push
             if action == 'push':
                 self._invalidate_cache(repo_name)
             log.info('%s action on GIT repo "%s" by "%s" from %s' %
                      (action, repo_name, username, ip_addr))
             app = self.__make_app(repo_name, repo_path, extras)
             return app(environ, start_response)
         except HTTPLockedRC, e:
             log.debug('Repository LOCKED ret code 423!')
             return e(environ, start_response)
         except Exception:
             log.error(traceback.format_exc())
             return HTTPInternalServerError()(environ, start_response)
         finally:
             # invalidate cache on push
             if action == 'push':
                 self._invalidate_cache(repo_name)
     def __make_app(self, repo_name, repo_path, extras):
         """
         Make an wsgi application using dulserver
         :param repo_name: name of the repository

rhodecode/lib/middleware/simplehg.py

➞

Show inline comments

@@ @@ -188,15 +188,12 @@ class SimpleHg(BaseVCSController): @@
         fix_PATH()
         log.debug('HOOKS extras is %s' % extras)
         baseui = make_ui('db')
         self.__inject_extras(repo_path, baseui, extras)
         try:
             # invalidate cache on push
             if action == 'push':
                 self._invalidate_cache(repo_name)
             log.info('%s action on HG repo "%s" by "%s" from %s' %
                      (action, repo_name, username, ip_addr))
             app = self.__make_app(repo_path, baseui, extras)
             return app(environ, start_response)
         except RepoError, e:
             if str(e).find('not found') != -1:
@@ @@ -204,12 +201,16 @@ class SimpleHg(BaseVCSController): @@
         except HTTPLockedRC, e:
             log.debug('Repository LOCKED ret code 423!')
             return e(environ, start_response)
         except Exception:
             log.error(traceback.format_exc())
             return HTTPInternalServerError()(environ, start_response)
         finally:
             # invalidate cache on push
             if action == 'push':
                 self._invalidate_cache(repo_name)
     def __make_app(self, repo_name, baseui, extras):
         """
         Make an wsgi application using hgweb, and inject generated baseui
         instance, additionally inject some extras into ui object
         """

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -1088,12 +1088,16 @@ class Repository(Base, BaseModel): @@
         """
         set a cache for invalidation for this instance
         """
         CacheInvalidation.set_invalidate(repo_name=self.repo_name)
     @LazyProperty
     def scm_instance_no_cache(self):
         return self.__get_instance()
     @LazyProperty
     def scm_instance(self):
         import rhodecode
         full_cache = str2bool(rhodecode.CONFIG.get('vcs_full_cache'))
         if full_cache:
             return self.scm_instance_cached()
         return self.__get_instance()

0 comments (0 inline, 0 general)