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