Show More
@@ -87,19 +87,14 b' def load_environment(global_conf, app_co' | |||||
87 | if not int(os.environ.get('RC_WHOOSH_TEST_DISABLE', 0)): |
|
87 | if not int(os.environ.get('RC_WHOOSH_TEST_DISABLE', 0)): | |
88 | create_test_index(TESTS_TMP_PATH, config, True) |
|
88 | create_test_index(TESTS_TMP_PATH, config, True) | |
89 |
|
89 | |||
90 | #check git version |
|
|||
91 | check_git_version() |
|
|||
92 | DbManage.check_waitress() |
|
90 | DbManage.check_waitress() | |
93 | # MULTIPLE DB configs |
|
91 | # MULTIPLE DB configs | |
94 | # Setup the SQLAlchemy database engine |
|
92 | # Setup the SQLAlchemy database engine | |
95 | sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.') |
|
93 | sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.') | |
96 | init_model(sa_engine_db1) |
|
94 | init_model(sa_engine_db1) | |
97 |
|
95 | |||
|
96 | set_available_permissions(config) | |||
98 | repos_path = make_ui('db').configitems('paths')[0][1] |
|
97 | repos_path = make_ui('db').configitems('paths')[0][1] | |
99 | if str2bool(config.get('initial_repo_scan', True)): |
|
|||
100 | repo2db_mapper(ScmModel().repo_scan(repos_path), |
|
|||
101 | remove_obsolete=False, install_git_hook=False) |
|
|||
102 | set_available_permissions(config) |
|
|||
103 | config['base_path'] = repos_path |
|
98 | config['base_path'] = repos_path | |
104 | set_rhodecode_config(config) |
|
99 | set_rhodecode_config(config) | |
105 |
|
100 | |||
@@ -114,6 +109,12 b' def load_environment(global_conf, app_co' | |||||
114 | # store config reference into our module to skip import magic of |
|
109 | # store config reference into our module to skip import magic of | |
115 | # pylons |
|
110 | # pylons | |
116 | rhodecode.CONFIG.update(config) |
|
111 | rhodecode.CONFIG.update(config) | |
|
112 | set_vcs_config(rhodecode.CONFIG) | |||
117 |
|
113 | |||
118 | set_vcs_config(rhodecode.CONFIG) |
|
114 | #check git version | |
|
115 | check_git_version() | |||
|
116 | ||||
|
117 | if str2bool(config.get('initial_repo_scan', True)): | |||
|
118 | repo2db_mapper(ScmModel().repo_scan(repos_path), | |||
|
119 | remove_obsolete=False, install_git_hook=False) | |||
119 | return config |
|
120 | return config |
General Comments 0
You need to be logged in to leave comments.
Login now