This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 8aa8d5d20f1934f9d3c2df164ca50fe9ed6d7ceb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 14:28:43 2015 +0200 fix-up for 1f63e95d2aed93eb96fb58c8aafd39c0a0949f2c --- x2gobroker/brokers/base_broker.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 94c351e..32dd12a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1345,6 +1345,7 @@ class X2GoBroker(object): _save_server_list = None _save_busy_servers = None initial_server_list = copy.deepcopy(server_list) + agent_query_mode_is_SSH = self.get_agent_query_mode(profile_id) == 'SSH' while not selected_session and server_list: @@ -1425,7 +1426,7 @@ class X2GoBroker(object): # status) if busy_servers is None: try: - if remote_agent['load_factors']: + if agent_query_mode_is_SSH and remote_agent['load_factors']: success, busy_servers = x2gobroker.agent.get_servers(username=username, remote_agent=remote_agent) else: success, busy_servers = x2gobroker.agent.find_busy_servers(username=username, remote_agent=remote_agent) @@ -1478,7 +1479,7 @@ class X2GoBroker(object): del busy_servers[busy_server] # dynamic load-balancing via load checker service - if remote_agent['load_factors']: + if agent_query_mode_is_SSH and remote_agent['load_factors']: load_factors = remote_agent['load_factors'] busy_servers_temp = copy.deepcopy(busy_servers) -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git