The branch, build-baikal has been updated via aaa397d3fb7760faef93327028199cc242fcb194 (commit) from ddce72c987c36e2adf9746c257d993d6dcd960cd (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/proxy/_nx3.py | 2 +- x2go/backends/proxy/base.py | 12 +++++++++++- x2go/backends/terminal/_stdout.py | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b50172e..7c04f4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low - Skip session auto registration during startups of new sessions (avoids duplicate sessions in the session registry. - Do not start X2go service tunnels (audio, sshfs) if session startup failed. + - Fix NX proxy startup post-check. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 23 Jun 2011 08:34:14 +0200 diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index 5f1f30f..2a5b8a0 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -172,7 +172,7 @@ options=%s""" % ( self.proxy_options['xkbrules'], p = base.X2goProxyBASE.start_proxy(self) - if p is not None: + if self.ok(): self.logger('NX3 proxy is up and running.', loglevel=log.loglevel_INFO) else: self.logger('Bringing up NX3 proxy failed.', loglevel=log.loglevel_ERROR) diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 5f92e57..0a3fc34 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -131,7 +131,7 @@ class X2goProxyBASE(threading.Thread): if left open. """ - if self.proxy is not None and self.proxy.poll() is None: + if self.ok(): self.logger('Shutting down X2go proxy subprocess', loglevel=log.loglevel_DEBUG) self.proxy.kill() if self.fw_tunnel is not None: @@ -266,3 +266,13 @@ class X2goProxyBASE(threading.Thread): gevent.sleep(.5) return self.proxy + + def ok(self): + """\ + Check if a proxy instance is up and running. + + @return: Proxy state (C{True} or C{False}) + @rtype C{bool} + + """ + return self.proxy and self.proxy.poll is not None diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index c13c11e..0ecf4ee 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -765,7 +765,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - return bool(self.session_info.name and (self.proxy_subprocess and self.proxy_subprocess.poll() is None)) + return bool(self.session_info.name and (self.proxy.ok()) def is_running(self): """\ 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).