Mercurial > kallithea

diff rhodecode/config/environment.py @ 1360:1f47adeb67c2 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bumped sqlalchemy version to 0.7, replaced timerproxy with new event system for sqlalchemy. TimerProxy is now longer valid profilling method for sqlalchemy
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 04 Jun 2011 20:34:30 +0200
parents 882ac77dc709
children b7563ad4e7ee
line wrap: on
line diff
--- a/rhodecode/config/environment.py	Sat Jun 04 01:16:39 2011 +0200
+++ b/rhodecode/config/environment.py	Sat Jun 04 20:34:30 2011 +0200
@@ -65,12 +65,7 @@
 
     #MULTIPLE DB configs
     # Setup the SQLAlchemy database engine
-    if config['debug'] and not test:
-        #use query time debugging.
-        sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.',
-                                           proxy=TimerProxy())
-    else:
-        sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
+    sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')
 
     init_model(sa_engine_db1)