[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.0.6-11-g7f25682

X2Go dev team git-admin at x2go.org
Tue Jun 4 21:09:56 CEST 2013


The branch, statusflag has been updated
       via  7f25682383416a9b0487d5cc0268dae9a8bdd0b4 (commit)
      from  8e73d26ce1bc5b1f8f1ce314877f90b37e6e8898 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 54de6ab..60e52c3 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -892,10 +892,12 @@ class X2GoBroker(object):
 
             else:
                 logger_broker.warning('base_broker.X2GoBroker.select_session(): all expected broker agents failed to respond, this does not look good. We tried these agent hosts: {agent_hosts}'.format(agent_hosts=unicode(server_list)))
-                best_server = server_list[0]
+                if server_list: best_server = server_list[0]
+                else: return { 'server': 'no-server-available', 'port': profile[u'sshport'], }
 
         else:
-            best_server = server_list[0]
+            if server_list: best_server = server_list[0]
+            else: return { 'server': 'no-server-available', 'port': profile[u'sshport'], }
 
         selected_session = {
             'server': best_server,


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