This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 64ff151 For reverse port forwardings use IPv4 localhost address only. new d5fcb46 Assure proper Telekinesis client cleanup when sessions suspends/terminates. new a40d73f Clean up terminal sessions properly when the clean_sessions() method of the control session has got called. new 6f0f1ae don't mention in __doc__ string what TeKi applications exist new b801156 Assure proper NX Proxy cleanup when sessions suspends/terminates. The 4 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 | 6 ++++++ x2go/backends/control/plain.py | 19 ++++++++++++++----- x2go/backends/proxy/base.py | 3 +-- x2go/backends/terminal/plain.py | 4 ---- x2go/telekinesis.py | 3 +-- 5 files changed, 22 insertions(+), 13 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit d5fcb4606c5e7480c62c6428f614a1b9d067795b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 5 15:16:26 2014 +0200 Assure proper Telekinesis client cleanup when sessions suspends/terminates. --- debian/changelog | 2 ++ x2go/telekinesis.py | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 082aad5..823dec0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low #588). - Use Xlib to detect client-side destop geometry. - For reverse port forwardings use IPv4 localhost address only. + - Assure proper Telekinesis client cleanup when sessions suspends/ + terminates. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/telekinesis.py b/x2go/telekinesis.py index 74f6097..7002a48 100644 --- a/x2go/telekinesis.py +++ b/x2go/telekinesis.py @@ -207,7 +207,6 @@ class X2GoTelekinesisClient(threading.Thread): _count += 1 self.logger('waiting for Telekinesis client to shut down: 0.5s x %s' % _count, loglevel=log.loglevel_DEBUG) gevent.sleep(.5) - self._tidy_up() def run(self): """\ @@ -271,7 +270,7 @@ class X2GoTelekinesisClient(threading.Thread): pass # once all is over... - self.tekiclient = None + self._tidy_up() def _update_local_tekictrl_socket(self, port): for idx, a in enumerate(self.TEKICLIENT_ARGS): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit a40d73f91b45f07130112b6c1aa1e22186d5fb5f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 5 15:17:39 2014 +0200 Clean up terminal sessions properly when the clean_sessions() method of the control session has got called. --- debian/changelog | 2 ++ x2go/backends/control/plain.py | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 823dec0..f5857ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -85,6 +85,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low - For reverse port forwardings use IPv4 localhost address only. - Assure proper Telekinesis client cleanup when sessions suspends/ terminates. + - Clean up terminal sessions properly when the clean_sessions() method + of the control session has got called. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 5409198..70f5ca2 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1706,7 +1706,15 @@ class X2GoControlSession(paramiko.SSHClient): else: session_names = [ _sn for _sn in session_list.keys() if not session_list[_sn].is_published_applications_provider() ] for session_name in session_names: - self.terminate(session_name=session_name, destroy_terminals=destroy_terminals) + if self.associated_terminals.has_key(session_name): + self.associated_terminals[session_name].terminate() + if destroy_terminals: + if self.associated_terminals[session_name] is not None: + self.associated_terminals[session_name].__del__() + try: del self.associated_terminals[session_name] + except KeyError: pass + else: + self.terminate(session_name=session_name) def is_connected(self): """\ @@ -1824,18 +1832,19 @@ class X2GoControlSession(paramiko.SSHClient): """ _ret = False - _session_names = [ t.get_session_name() for t in self.associated_terminals.values() ] - if session_name in _session_names: + if session_name in self.associated_terminals.keys(): self.logger('terminating associated session: %s' % session_name, loglevel=log.loglevel_DEBUG) (stdin, stdout, stderr) = self._x2go_exec_command("x2goterminate-session %s" % session_name, loglevel=log.loglevel_DEBUG) stdout.read() stderr.read() - if self.associated_terminals.has_key(session_name): - if self.associated_terminals[session_name] is not None and destroy_terminals: + + if destroy_terminals: + if self.associated_terminals[session_name] is not None: self.associated_terminals[session_name].__del__() try: del self.associated_terminals[session_name] except KeyError: pass + self.terminated_terminals.append(session_name) _ret = True -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 6f0f1aea323a36adf65c64d6c88ce231293861b4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 5 15:18:21 2014 +0200 don't mention in __doc__ string what TeKi applications exist --- x2go/backends/terminal/plain.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py index 19be890..198b38c 100644 --- a/x2go/backends/terminal/plain.py +++ b/x2go/backends/terminal/plain.py @@ -776,10 +776,6 @@ class X2GoTerminalSession(object): """\ Initialize Telekinesis client for X2Go. - Currently supported apps of Telekinesis: - - - mTelePlayer - """ if self.telekinesis_client is not None: del self.telekinesis_client -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit b801156e6ad76fd66955d000adf693ef10002ad2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 5 15:19:54 2014 +0200 Assure proper NX Proxy cleanup when sessions suspends/terminates. --- debian/changelog | 2 ++ x2go/backends/proxy/base.py | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5857ed..fda0ce3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low #588). - Use Xlib to detect client-side destop geometry. - For reverse port forwardings use IPv4 localhost address only. + - Assure proper NX Proxy cleanup when sessions suspends/ + terminates. - Assure proper Telekinesis client cleanup when sessions suspends/ terminates. - Clean up terminal sessions properly when the clean_sessions() method diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 7a5d914..2515525 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -156,7 +156,6 @@ class X2GoProxy(threading.Thread): # wait for thread loop to finish... while self.proxy is not None: gevent.sleep(.5) - self._tidy_up() def run(self): """\ @@ -238,7 +237,7 @@ class X2GoProxy(threading.Thread): except WindowsError: pass - self.proxy = None + self._tidy_up() def process_proxy_options(self): """\ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org