This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit a9caabfe441d42fae0b64e31b3ad0aea5b9f94bf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jun 24 16:14:38 2014 +0200 Only enable Telekinesis client debugging if the logger instance is in debug mode. --- debian/changelog | 2 ++ x2go/telekinesis.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index afe54ec..aef8cf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low contains one line "ID:<window-id>". The file appears once a session window comes up (start/resume), and disappears once the session window closes (suspend/terminate). + - Only enable Telekinesis client debugging if the logger instance is in + debug mode. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/telekinesis.py b/x2go/telekinesis.py index 72d1a05..b32b30f 100644 --- a/x2go/telekinesis.py +++ b/x2go/telekinesis.py @@ -58,7 +58,7 @@ class X2GoTelekinesisClient(threading.Thread): """ TEKICLIENT_CMD = 'telekinesis-client' """Telekinesis client command. Might be OS specific.""" - TEKICLIENT_ARGS = ['-setDEBUG=1', '-setWORMHOLEPORT={port}', '-setX2GOSID={sid}', ] + TEKICLIENT_ARGS = ['-setWORMHOLEPORT={port}', '-setX2GOSID={sid}', ] """Arguments to be passed to the Telekinesis client.""" TEKICLIENT_ENV = {} """Provide environment variables to the Telekinesis client command.""" @@ -110,6 +110,9 @@ class X2GoTelekinesisClient(threading.Thread): self.logger = copy.deepcopy(logger) self.logger.tag = __NAME__ + if self.logger.get_loglevel() & log.loglevel_DEBUG: + self.TEKICLIENT_ARGS.extend(['-setDEBUG=1',]) + self.sessions_rootdir = sessions_rootdir self.session_info = session_info self.session_name = self.session_info.name -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git