The branch, master has been updated via a09cb5d919db85333e4e45d4935f430dbee8a8f2 (commit) from 8a8ad57326d713aa46ef00d17ad8b9a95620ba40 (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 a09cb5d919db85333e4e45d4935f430dbee8a8f2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 18 23:28:03 2013 +0200 Revert "Do not let the broker crash if an agent is not reachable. Capture X2GoBrokerAgentExceptions when pinging the remote agent." This reverts commit 8a8ad57326d713aa46ef00d17ad8b9a95620ba40. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 -- x2gobroker/brokers/base_broker.py | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6cf3969..9628994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,6 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Get the cookie based extra-authentication working for SSH mode. - Get the cookie based extra-authentication working for HTTP mode. - Fix output of HTTP based connectivity test. - - Do not let the broker crash if an agent is not reachable. Capture - X2GoBrokerAgentExceptions when pinging the remote agent. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 7254377..3a7aa7a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -816,11 +816,8 @@ class X2GoBroker(object): remote_agent_port = profile[u'sshport'] remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } - try: - if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): - break - except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException: - pass + if x2gobroker.agent.ping(query_mode=agent_query_mode, remote_agent=remote_agent): + break server_list = server_list[0:-1] 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).