engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config: Move pyro4 initialization to load_pyramid_environment.

Browse source
This commit is contained in:
Martin Bornhold 2016-08-10 12:11:49 +02:00
parent 0a79070b77
commit 8e0eed4a23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/config/environment.py
View file

@ -137,7 +137,6 @@ def load_environment(global_conf, app_conf, initial=False,
# store config reference into our module to skip import magic of pylons # store config reference into our module to skip import magic of pylons
rhodecode.CONFIG.update(config) rhodecode.CONFIG.update(config)
utils.configure_pyro4(config)
return config return config
@ -175,6 +174,7 @@ def load_pyramid_environment(global_config, settings):
protocol=utils.get_vcs_server_protocol(settings), protocol=utils.get_vcs_server_protocol(settings),
log_level=settings['vcs.server.log_level']) log_level=settings['vcs.server.log_level'])
utils.configure_pyro4(settings)
utils.configure_vcs(settings) utils.configure_vcs(settings)
if vcs_server_enabled: if vcs_server_enabled:
connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings)) connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))