Mercurial > kallithea
diff rhodecode/config/environment.py @ 1018:da5075ce681c beta
rhodecode config module refactoring
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 10 Feb 2011 22:41:30 +0100 |
parents | 02246101c846 |
children | 405b80e4ccd5 |
line wrap: on
line diff
--- a/rhodecode/config/environment.py Thu Feb 10 21:56:14 2011 +0100 +++ b/rhodecode/config/environment.py Thu Feb 10 22:41:30 2011 +0100 @@ -6,6 +6,7 @@ from mako.lookup import TemplateLookup from pylons.configuration import PylonsConfig from pylons.error import handle_mako_error +from sqlalchemy import engine_from_config import rhodecode.lib.app_globals as app_globals import rhodecode.lib.helpers @@ -16,7 +17,7 @@ from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config from rhodecode.model import init_model from rhodecode.model.scm import ScmModel -from sqlalchemy import engine_from_config +from rhodecode.lib.timerproxy import TimerProxy log = logging.getLogger(__name__) @@ -65,7 +66,6 @@ # Setup the SQLAlchemy database engine if config['debug'] and not test: #use query time debugging. - from rhodecode.lib.timerproxy import TimerProxy sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.', proxy=TimerProxy()) else: