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