# HG changeset patch
# User Martin Bornhold <martin@rhodecode.com>
# Date 2016-08-10 10:11:49
# Node ID 46bacf9f350e08fd8d98d5f3f86aa25deb08f3cb
# Parent  e0a65beb1123d60b01e813bd532071cb5350d5d1

config: Move pyro4 initialization to load_pyramid_environment.

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