[X2Go-Commits] x2gobroker.git - master (branch) updated:

X2Go dev team git-admin at x2go.org
Wed Oct 2 16:58:17 CEST 2013

The branch, master has been updated
       via  6f11897f570fdea9e1c1353ac2a614b253183a7e (commit)
      from  632a954598d35de61d9e77d2bc716ccb52763622 (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 6f11897f570fdea9e1c1353ac2a614b253183a7e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 2 16:49:09 2013 +0200

    Fix remote agent detection in case of some agents being down.


Summary of changes:
 debian/changelog                  |    1 +
 x2gobroker/brokers/base_broker.py |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fb7a240..8a05da2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,7 @@ x2gobroker ( UNRELEASED; urgency=low
       Broker logging instance. (Fixes: #217).
     - Fix the ping task in x2gobroker-agent.pl, process it without checking the
       given username.
+    - Fix remote agent detection in case of some agents being down.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
   * /debian/x2gobroker-agent.dirs:
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 0cfd81c..8736c78 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -830,11 +830,11 @@ class X2GoBroker(object):
                     if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent):
                 except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException:
-                    pass
+                    remote_agent = None
                 server_list = server_list[0:-1]
-            else:
+            if remote_agent is None:
                 logger_broker.warning('base_broker.X2GoBroker.get_remote_agent(): failed to allocate any broker agent (query-mode: {query_mode}, remote_agent: {remote_agent})'.format(query_mode=agent_query_mode, remote_agent=remote_agent))
         elif agent_query_mode == u'LOCAL':

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