Mercurial > kallithea
diff rhodecode/config/environment.py @ 1723:64e91067b996 beta
- refactoring to overcome poor usage of global pylons config
- db transaction fixes
- fixed tests
- garden
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 26 Nov 2011 02:16:21 +0200 |
parents | b7563ad4e7ee |
children | 2370fc2a04f2 |
line wrap: on
line diff
--- a/rhodecode/config/environment.py Sat Nov 26 00:11:32 2011 +0200 +++ b/rhodecode/config/environment.py Sat Nov 26 02:16:21 2011 +0200 @@ -7,13 +7,14 @@ from pylons.configuration import PylonsConfig from pylons.error import handle_mako_error +import rhodecode import rhodecode.lib.app_globals as app_globals import rhodecode.lib.helpers from rhodecode.config.routing import make_map -from rhodecode.lib import celerypylons +# don't remove this import it does magic for celery +from rhodecode.lib import celerypylons, str2bool from rhodecode.lib import engine_from_config -from rhodecode.lib.timerproxy import TimerProxy from rhodecode.lib.auth import set_available_permissions from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config from rhodecode.model import init_model @@ -38,6 +39,10 @@ # Initialize config with the basic options config.init_app(global_conf, app_conf, package='rhodecode', paths=paths) + # store some globals into our main isntance + rhodecode.CELERY_ON = str2bool(config['app_conf'].get('use_celery')) + rhodecode.CONFIG = config + config['routes.map'] = make_map(config) config['pylons.app_globals'] = app_globals.Globals(config) config['pylons.h'] = rhodecode.lib.helpers @@ -61,7 +66,7 @@ from rhodecode.lib.utils import create_test_env, create_test_index from rhodecode.tests import TESTS_TMP_PATH create_test_env(TESTS_TMP_PATH, config) - create_test_index(TESTS_TMP_PATH, config, True) + #create_test_index(TESTS_TMP_PATH, config, True) #MULTIPLE DB configs # Setup the SQLAlchemy database engine