This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 9e05ee5 X2GoControlSession: Don't mess with the associated_terminals dict if the control session has already died away (i.e. been forcefully disconnect). new 4661991 improve log message new 9fbb26f If the listsessions command detects a terminated or suspended session, we have to destroy the corresponding X2GoTerminalSession() to trigger a proper cleanup of that instance. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ x2go/backends/control/plain.py | 2 ++ x2go/backends/terminal/plain.py | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 4661991205683eee3852131fe5eb153763988f0a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Oct 9 18:37:23 2014 +0200 improve log message --- x2go/backends/terminal/plain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py index 2af0b50..7c10c64 100644 --- a/x2go/backends/terminal/plain.py +++ b/x2go/backends/terminal/plain.py @@ -1115,7 +1115,7 @@ class X2GoTerminalSession(object): os.remove(session_window_file) except OSError,e: # this is no error in most cases... - self.logger('Failed to remove session.window file %s with error: %s' % (session_window_file, str(e)), loglevel=log.loglevel_INFO) + self.logger('The session window file %s is already gone (we failed to remove it with error: %s). In most cases this can be safely ignored.' % (session_window_file, str(e)), loglevel=log.loglevel_INFO) def set_session_window_title(self, title, timeout=60): """\ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 9fbb26fd97432ba61f492cb926f8312a1886ce99 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Oct 9 18:38:45 2014 +0200 If the listsessions command detects a terminated or suspended session, we have to destroy the corresponding X2GoTerminalSession() to trigger a proper cleanup of that instance. --- debian/changelog | 3 +++ x2go/backends/control/plain.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8cdfe2c..145425c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,9 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low - X2GoControlSession: Don't mess with the associated_terminals dict if the control session has already died away (i.e. been forcefully disconnect). + - If the listsessions command detects a terminated or suspended session, + we have to destroy the corresponding X2GoTerminalSession() to trigger + a proper cleanup of that instance. * debian/control: + Add dependencies: python-requests, python-simplejson. + Add R (python-x2go): sshfs. diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index d678276..6dfe924 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -1681,10 +1681,12 @@ class X2GoControlSession(paramiko.SSHClient): if hasattr(self.associated_terminals[_session_name], 'session_info') and not self.associated_terminals[_session_name].is_session_info_protected(): self.associated_terminals[_session_name].session_info.update(_listsessions[_session_name]) else: + self.associated_terminals[_session_name].__del__() try: del self.associated_terminals[_session_name] except KeyError: pass self.terminated_terminals.append(_session_name) if _terminal.is_suspended(): + self.associated_terminals[_session_name].__del__() try: del self.associated_terminals[_session_name] except KeyError: pass -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org