[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.5-21-g5c50b38
X2Go dev team
git-admin at x2go.org
Fri Mar 1 23:18:11 CET 2013
The branch, master has been updated
via 5c50b38d3bba839076228f8aec49823092c3c0f6 (commit)
from 8efcb47747dd16ce1ad139c0cc47a5e4ebea6e9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5c50b38d3bba839076228f8aec49823092c3c0f6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Mar 1 23:18:06 2013 +0100
the remote agent is also required for non-loadbalancing session profiles
-----------------------------------------------------------------------
Summary of changes:
x2gobroker/brokers/base_broker.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 10cda40..717113c 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -802,14 +802,14 @@ class X2GoBroker(object):
server_list = profile[u'host']
agent_query_mode = self.get_agent_query_mode()
- if len(server_list) >= 2:
+ remote_agent = None
+ if agent_query_mode.upper() == u'SSH':
+ random.shuffle(server_list)
+ remote_agent_server = server_list[0]
+ remote_agent_port = profile[u'sshport']
+ remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, }
- remote_agent = None
- if agent_query_mode.upper() == u'SSH':
- random.shuffle(server_list)
- remote_agent_server = server_list[0]
- remote_agent_port = profile[u'sshport']
- remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, }
+ if len(server_list) >= 2:
busy_servers = x2gobroker.agent.find_busy_servers(username=username, query_mode=agent_query_mode, remote_agent = remote_agent)
hooks/post-receive
--
x2gobroker.git (HTTP(S) Session broker for X2Go)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).
More information about the x2go-commits
mailing list