[X2Go-Commits] [python-x2go] 01/02: Use session_name, not session_info object's __str__() method to obtain session name (in X2GoTelekinesis).
git-admin at x2go.org
git-admin at x2go.org
Fri Oct 3 13:03:14 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository python-x2go.
commit 05643fcde744c186563177adf1288158dd49af95
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Oct 3 13:02:37 2014 +0200
Use session_name, not session_info object's __str__() method to obtain session name (in X2GoTelekinesis).
---
debian/changelog | 2 ++
x2go/telekinesis.py | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c82ca2d..29b29b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -94,6 +94,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
" (2)", ... to the session profile name). (Fixes: #500).
- Support server-side Telekinesis versions that ship their own
(teki-)sftpserver.
+ - Use session_name, not session_info object's __str__() method to obtain
+ session name (in X2GoTelekinesis).
* debian/control:
+ Add dependencies: python-requests, python-simplejson.
* python-x2go.spec:
diff --git a/x2go/telekinesis.py b/x2go/telekinesis.py
index 16b6ea2..bf93f0b 100644
--- a/x2go/telekinesis.py
+++ b/x2go/telekinesis.py
@@ -171,7 +171,7 @@ class X2GoTelekinesisClient(threading.Thread):
self.fw_ctrl_tunnel = None
if self.telekinesis_sshfs is not None:
- telekinesis_sshfs_command = ['fusermount', '-u', '/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_info), ]
+ telekinesis_sshfs_command = ['fusermount', '-u', '/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_name), ]
self.logger('Umounting SSHFS mount for Telekinesis via forking a threaded subprocess: %s' % " ".join(telekinesis_sshfs_command), loglevel=log.loglevel_DEBUG)
self.telekinesis_sshfs_umount = subprocess.Popen(telekinesis_sshfs_command,
env=self.TEKICLIENT_ENV,
@@ -283,7 +283,7 @@ class X2GoTelekinesisClient(threading.Thread):
"""
cmd_line = [ self.TEKICLIENT_CMD, ]
- _tekiclient_args = " ".join(self.TEKICLIENT_ARGS).format(sid=self.session_info).split(' ')
+ _tekiclient_args = " ".join(self.TEKICLIENT_ARGS).format(sid=self.session_name).split(' ')
cmd_line.extend(_tekiclient_args)
return cmd_line
@@ -321,7 +321,7 @@ class X2GoTelekinesisClient(threading.Thread):
self.tekiclient_datalog_stdout = open('%s/%s' % (self.session_info.local_container, self.tekiclient_datalog, ), 'a')
self.tekiclient_datalog_stderr = open('%s/%s' % (self.session_info.local_container, self.tekiclient_datalog, ), 'a')
try:
- os.makedirs(os.path.normpath('/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_info)))
+ os.makedirs(os.path.normpath('/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_name)))
except OSError, e:
if e.errno == 17:
# file exists
@@ -334,7 +334,7 @@ class X2GoTelekinesisClient(threading.Thread):
'-o', 'follow_symlinks',
'-o', 'directport={tekidata_port}'.format(tekidata_port=self.local_tekidata_port),
'127.0.0.1:/',
- '/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_info),
+ '/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_name),
]
else:
# very first Telekinesis Server implementation used OpenSSH's sftp-server
@@ -343,8 +343,8 @@ class X2GoTelekinesisClient(threading.Thread):
'-o', 'compression=no',
'-o', 'follow_symlinks',
'-o', 'directport={tekidata_port}'.format(tekidata_port=self.local_tekidata_port),
- '127.0.0.1:{remote_home}/.x2go/C-{sid}/telekinesis/remote/'.format(remote_home=self.session_instance.get_remote_home(), sid=self.session_info),
- '/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_info),
+ '127.0.0.1:{remote_home}/.x2go/C-{sid}/telekinesis/remote/'.format(remote_home=self.session_instance.get_remote_home(), sid=self.session_name),
+ '/tmp/.x2go-{local_user}/telekinesis/S-{sid}/'.format(local_user=_CURRENT_LOCAL_USER, sid=self.session_name),
]
self.logger('forking threaded subprocess: %s' % " ".join(telekinesis_sshfs_command), loglevel=log.loglevel_DEBUG)
self.telekinesis_sshfs = subprocess.Popen(telekinesis_sshfs_command,
@@ -387,7 +387,7 @@ class X2GoTelekinesisClient(threading.Thread):
gevent.sleep(.5)
else:
- self.logger('Aborting Telekinesis client startup for session %s, because the Telekinesis data connection failed to be established.' % (self.session_info,), loglevel=log.loglevel_WARN)
+ self.logger('Aborting Telekinesis client startup for session %s, because the Telekinesis data connection failed to be established.' % (self.session_name,), loglevel=log.loglevel_WARN)
return self.tekiclient, bool(self.tekiclient) and (self.fw_ctrl_tunnel and self.fw_ctrl_tunnel.is_active)
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
More information about the x2go-commits
mailing list