##// END OF EJS Templates
config: Move pyro4 initialization to load_pyramid_environment.
Martin Bornhold -
r625:46bacf9f default
parent child Browse files
Show More
@@ -137,7 +137,6 b' def load_environment(global_conf, app_co'
137 # store config reference into our module to skip import magic of pylons
137 # store config reference into our module to skip import magic of pylons
138 rhodecode.CONFIG.update(config)
138 rhodecode.CONFIG.update(config)
139
139
140 utils.configure_pyro4(config)
141 return config
140 return config
142
141
143
142
@@ -175,6 +174,7 b' def load_pyramid_environment(global_conf'
175 protocol=utils.get_vcs_server_protocol(settings),
174 protocol=utils.get_vcs_server_protocol(settings),
176 log_level=settings['vcs.server.log_level'])
175 log_level=settings['vcs.server.log_level'])
177
176
177 utils.configure_pyro4(settings)
178 utils.configure_vcs(settings)
178 utils.configure_vcs(settings)
179 if vcs_server_enabled:
179 if vcs_server_enabled:
180 connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))
180 connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))
General Comments 0
You need to be logged in to leave comments. Login now