The branch, master has been updated via 61a2a2eac22d0bc925de49183a4e5a957f8650ac (commit) via 37890ac8deb12f53ab77ed0490d145e7a867ed40 (commit) from 9e147d7aad30417c405de5621054f7a1503ccded (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 61a2a2eac22d0bc925de49183a4e5a957f8650ac Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 29 16:32:10 2012 +0200 cosmetic fixes commit 37890ac8deb12f53ab77ed0490d145e7a867ed40 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 29 16:31:45 2012 +0200 HOOK_forward_tunnel_setup_failed fixed ----------------------------------------------------------------------- Summary of changes: x2go/backends/proxy/base.py | 6 +++--- x2go/client.py | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 610ef18..1c62313 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -183,8 +183,8 @@ class X2goProxyBASE(threading.Thread): local_graphics_port = utils.detect_unused_port(preferred_port=local_graphics_port) self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port, - remote_port=self.session_info.graphics_port, - ssh_transport=self.ssh_transport, + remote_port=self.session_info.graphics_port, + ssh_transport=self.ssh_transport, session_instance=self.session_instance, logger=self.logger, ) @@ -278,7 +278,7 @@ class X2goProxyBASE(threading.Thread): # also wait for fw_tunnel to become active _count = 0 _maxwait = 40 - while not self.fw_tunnel.is_active and not self.fw_tunnel.failed and _count < _maxwait: + while (not self.fw_tunnel.is_active) and (not self.fw_tunnel.failed) and (_count < _maxwait): _count += 1 self.logger('waiting for port fw tunnel to come up: 0.5s x %s' % _count, loglevel=log.loglevel_DEBUG) gevent.sleep(.5) diff --git a/x2go/client.py b/x2go/client.py index 94e5c7d..e568112 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -534,7 +534,7 @@ class X2goClient(object): @type chain_port: C{str} """ - self.logger('Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2go/SSH server. Session startup failed.' % (chain_host, chain_port, self.session_name, self.profile_name), loglevel=log.loglevel_ERROR) + self.logger('Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2go/SSH server. Session startup failed.' % (chain_host, chain_port, session_name, profile_name), loglevel=log.loglevel_ERROR) def HOOK_on_session_has_started_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'): """\ @@ -2380,7 +2380,7 @@ class X2goClient(object): ### CLIENT OPERATIONS ON SESSIONS (listing sessions, terminating non-associated sessions etc.) ### - def clean_sessions(self, session_uuid, published_applications=None): + def clean_sessions(self, session_uuid, published_applications=False): """\ Find running X2Go sessions that have previously been started by the connected user on the remote X2Go server and terminate them. @@ -2392,13 +2392,14 @@ class X2goClient(object): @param session_uuid: the X2Go session's UUID registry hash @type session_uuid: C{str} + @param published_applications: if C{True}, also terminate sessions that are published applications + provider + @type published_applications: C{bool} """ _destroy_terminals = not ( self.auto_update_sessionregistry == True) session = self.session_registry(session_uuid) profile_name = session.get_profile_name() - if published_applications is None: - published_applications = self.session_profiles.get_profile_config(profile_name)['published'] session.clean_sessions(destroy_terminals=_destroy_terminals, published_applications=published_applications) __clean_sessions = clean_sessions hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).