This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit b4d53b61753c61a8095eadf5ba77f898a67b82f7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 30 16:33:27 2015 +0200 If non-load-balanced session profiles reference a non-reachable host, hand-back the system's hostname to X2Go Client / Python X2Go. --- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1caaeb2..8ac74a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -281,6 +281,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low owned by user x2gobroker. - rpm/x2gobroker-*.init: Fix copy+paste errors. - man pages: Update date. + - If non-load-balanced session profiles reference a non-reachable host, + hand-back the system's hostname to X2Go Client / Python X2Go. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + 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 5c3356f..2c3fcde 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1583,10 +1583,17 @@ class X2GoBroker(object): session_info = None if not selected_session and not server_list: - selected_session = { - u'server': u'no-X2Go-Server-available', - u'port': server_port, - } + if len(initial_server_list) > 1: + selected_session = { + u'server': u'no-X2Go-Server-available', + u'port': server_port, + } + else: + # hand-over the original hostname for non-load-balanced session profiles + selected_session = { + u'server': initial_server_list[0], + u'port': server_port, + } # are we resuming a running/suspended session? if session_info is not None: -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git