# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1337257603 -7200
# Node ID e2dbdaf13562ef1d4f2337f484af4be74b57fa9e
# Parent  4747af4ce203bfe35911d3461b749cbc35ec62ba
Don't clear dbsessions when celery_eager is turned on

diff -r 4747af4ce203 -r e2dbdaf13562 docs/changelog.rst
--- a/docs/changelog.rst	Thu May 17 14:03:35 2012 +0200
+++ b/docs/changelog.rst	Thu May 17 14:26:43 2012 +0200
@@ -13,12 +13,14 @@
 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
 +++++
 
+
+
 1.3.6 (**2012-05-17**)
 ----------------------
 
@@ -36,6 +38,7 @@
 - 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
 
 1.3.5 (**2012-05-10**)
 ----------------------
diff -r 4747af4ce203 -r e2dbdaf13562 rhodecode/__init__.py
--- a/rhodecode/__init__.py	Thu May 17 14:03:35 2012 +0200
+++ b/rhodecode/__init__.py	Thu May 17 14:26:43 2012 +0200
@@ -89,6 +89,7 @@
 }
 
 CELERY_ON = False
+CELERY_EAGER = False
 
 # link to config for pylons
 CONFIG = {}
diff -r 4747af4ce203 -r e2dbdaf13562 rhodecode/config/environment.py
--- a/rhodecode/config/environment.py	Thu May 17 14:03:35 2012 +0200
+++ b/rhodecode/config/environment.py	Thu May 17 14:26:43 2012 +0200
@@ -47,6 +47,7 @@
 
     # 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)
diff -r 4747af4ce203 -r e2dbdaf13562 rhodecode/lib/celerylib/__init__.py
--- a/rhodecode/lib/celerylib/__init__.py	Thu May 17 14:03:35 2012 +0200
+++ b/rhodecode/lib/celerylib/__init__.py	Thu May 17 14:26:43 2012 +0200
@@ -35,7 +35,7 @@
 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
@@ -122,7 +122,7 @@
             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)
diff -r 4747af4ce203 -r e2dbdaf13562 rhodecode/lib/celerylib/tasks.py
--- a/rhodecode/lib/celerylib/tasks.py	Thu May 17 14:03:35 2012 +0200
+++ b/rhodecode/lib/celerylib/tasks.py	Thu May 17 14:26:43 2012 +0200
@@ -39,7 +39,7 @@
 
 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