kallithea Changeset - e2dbdaf13562

Changeset - e2dbdaf13562

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2012-05-17 14:26:43
marcin@python-works.com

Don't clear dbsessions when celery_eager is turned on

5 files changed with 10 insertions and 5 deletions:

docs/changelog.rst

rhodecode/__init__.py

rhodecode/config/environment.py

rhodecode/lib/celerylib/__init__.py

rhodecode/lib/celerylib/tasks.py

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -10,18 +10,20 @@ Changelog @@
 :status: in-progress
 :branch: beta
 news
 ++++
  - new codereview system
  - changed setup-app into setup-rhodecode and added default options to it.
 - new codereview system
 - changed setup-app into setup-rhodecode and added default options to it.
 fixes
 +++++
 .3.6 (**2012-05-17**)
 ----------------------
 news
 ++++
@@ @@ -33,12 +35,13 @@ fixes @@
 +++++
 - fixed no scm found warning
 - fixed __future__ import error on rcextensions
 - made simplejson required lib for speedup on JSON encoding
 - fixes #449 bad regex could get more than revisions from parsing history
 - don't clear DB session when CELERY_EAGER is turned ON
 .3.5 (**2012-05-10**)
 ----------------------
 news
 ++++

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -86,12 +86,13 @@ def get_version(): @@
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
+}
 CELERY_ON = False
 CELERY_EAGER = False
 # link to config for pylons
 CONFIG = {}
 # Linked module for extensions
 EXTENSIONS = {}

rhodecode/config/environment.py

➞

Show inline comments

@@ @@ -44,12 +44,13 @@ def load_environment(global_conf, app_co @@
     # Initialize config with the basic options
     config.init_app(global_conf, app_conf, package='rhodecode', paths=paths)
     # store some globals into rhodecode
     rhodecode.CELERY_ON = str2bool(config['app_conf'].get('use_celery'))
     rhodecode.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager'))
     config['routes.map'] = make_map(config)
     config['pylons.app_globals'] = app_globals.Globals(config)
     config['pylons.h'] = helpers
     rhodecode.CONFIG = config

rhodecode/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ from os.path import dirname as dn, join @@
 from pylons import config
 from hashlib import md5
 from decorator import decorator
 from rhodecode.lib.vcs.utils.lazy import LazyProperty
 from rhodecode import CELERY_ON
+from rhodecode import CELERY_ON, CELERY_EAGER
 from rhodecode.lib.utils2 import str2bool, safe_str
 from rhodecode.lib.pidlock import DaemonLock, LockHeld
 from rhodecode.model import init_model
 from rhodecode.model import meta
 from rhodecode.model.db import Statistics, Repository, User
@@ @@ -119,10 +119,10 @@ def get_session(): @@
 def dbsession(func):
     def __wrapper(func, *fargs, **fkwargs):
         try:
             ret = func(*fargs, **fkwargs)
             return ret
         finally:
             if CELERY_ON:
+            if CELERY_ON and CELERY_EAGER is False:
                 meta.Session.remove()
     return decorator(__wrapper, func)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -36,13 +36,13 @@ from string import lower @@
 from pylons import config, url
 from pylons.i18n.translation import _
 from rhodecode.lib.vcs import get_backend
 from rhodecode import CELERY_ON
+from rhodecode import CELERY_ON, CELERY_EAGER
 from rhodecode.lib.utils2 import safe_str
 from rhodecode.lib.celerylib import run_task, locked_task, dbsession, \
     str2bool, __get_lockkey, LockHeld, DaemonLock, get_session
 from rhodecode.lib.helpers import person
 from rhodecode.lib.rcmail.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils import add_cache, action_logger

0 comments (0 inline, 0 general)