This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 67945a5 drop »« quotes in postinst script output new 747f36a fix for 04e5defd3089db9075501a99624f64c9926bedb5 new 1abd30c If a single-host is unreachable, return the host address, not the hostname and let X2Go Client release itself, that the host is unreachable. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 747f36afae3e31abc5dc874d3313a0a50b90afdb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 1 10:00:04 2015 +0200 fix for 04e5defd3089db9075501a99624f64c9926bedb5 --- x2gobroker/brokers/base_broker.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index fa89ccd..407db5c 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -546,11 +546,6 @@ class X2GoBroker(object): _backend_agent_query_mode = "" _agent_query_mode = "" - # if the frontend overrides the agent query mode, immediately return it here... - if self._enforce_agent_query_mode(mode=_mode): - logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): broker frontend overrides configured agent query mode, using mode agent query mode "{mode}".'.format(mode=_agent_query_mode)) - return self._enforce_agent_query_mode(mode=_mode) - _profile = self.get_profile_broker(profile_id) if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: _agent_query_mode = _profile[u'broker-agent-query-mode'] @@ -564,7 +559,15 @@ class X2GoBroker(object): _default_agent_query_mode = self.config.get_value('global', 'default-agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found default-agent-query-mode in global config section: {value}'.format(value=_default_agent_query_mode)) - return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode) + _mode = unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode) + + # if the frontend overrides the agent query mode, immediately return it here... + if self._enforce_agent_query_mode(mode=_mode): + _new_mode = self._enforce_agent_query_mode(mode=_mode) + logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): broker frontend overrides configured agent query mode ("{mode}"), using mode agent query mode: "{new_mode}".'.format(mode=_mode, new_mode=_new_mode)) + return _new_mode + else: + return _mode def get_session_autologin(self, profile_id): """\ -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 1abd30cc277c907f1552382b53c61da8689c24ae Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 1 10:00:51 2015 +0200 If a single-host is unreachable, return the host address, not the hostname and let X2Go Client release itself, that the host is unreachable. --- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b75b4c8..d51bd70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -294,6 +294,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low mode. Avoid logging of the configured query mode. Write the overridden query mode to the logger instance instead. - Don't enforce agent query mode "SSH" for x2gobroker-ssh anymore. + - If a single-host is unreachable, return the host address, not the hostname + and let X2Go Client release itself, that the host is unreachable. * 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 407db5c..6b10c78 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1591,9 +1591,15 @@ class X2GoBroker(object): } else: # hand-over the original hostname for non-load-balanced session profiles + failed_server_port = server_port + failed_server_name = initial_server_list[0] + try: failed_server_port = profile['port={hostname}'.format(hostname=failed_server_name)] + except KeyError: pass + try: failed_server_name = profile['host={hostname}'.format(hostname=failed_server_name)] + except KeyError: pass selected_session = { - u'server': initial_server_list[0], - u'port': server_port, + u'server': failed_server_name, + u'port': failed_server_port, } # are we resuming a running/suspended session? -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org