[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.1-33-gbb450a2

X2Go dev team git-admin at x2go.org
Tue Feb 19 21:34:23 CET 2013


The branch, master has been updated
       via  bb450a2ea118c06895c26080e1a2fed06ceec5ae (commit)
      from  9f6eaa8a2b8d2901875d87f00d4deb6e5822f2ec (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 bb450a2ea118c06895c26080e1a2fed06ceec5ae
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 19 21:37:04 2013 +0100

    only run agent code if there are 2 or more servers configured in the session profile

-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/brokers/base_broker.py |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 7b812a3..6bbb227 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -711,7 +711,10 @@ class X2GoBroker(object):
         random.shuffle(server_list)
         agent_query_server = server_list[0]
 
-        best_server = x2gobroker.agent.find_best_server()
+        if len(server_list) >= 2:
+            best_server = x2gobroker.agent.find_best_server()
+        else:
+            best_server = server_list[0]
 
         selected_session = {
             'server': best_server,
@@ -719,7 +722,7 @@ class X2GoBroker(object):
         }
 
         # do some load balancing if more than one server is configured
-        if len(server_list) >= 1 and username:
+        if len(server_list) >= 2 and username:
 
             session_list = x2gobroker.agent.list_sessions(username=username)
             if session_list:


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