This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from ef9d36f After calling x2gomountdirs, write stdout and _stderr_ to the logging instance. new ecea56a Catch yet another X2GoControlSessionException. This time during control_backend.remote_peer() during X2GoSession._resume(). The 1 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 | 2 ++ x2go/session.py | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) -- 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 ecea56a42a82377e70300363e8050a13f77f9e08 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 15 11:04:20 2015 +0100 Catch yet another X2GoControlSessionException. This time during control_backend.remote_peer() during X2GoSession._resume(). --- debian/changelog | 2 ++ x2go/session.py | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4dcb893..5cb6670 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ python-x2go (0.5.0.3-0x2go1) UNRELEASED; urgency=medium authentication. - After calling x2gomountdirs, write stdout and _stderr_ to the logging instance. + - Catch yet another X2GoControlSessionException. This time during + control_backend.remote_peer() during X2GoSession._resume(). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 13:15:44 +0100 diff --git a/x2go/session.py b/x2go/session.py index 46e7389..55a04cc 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1895,10 +1895,16 @@ class X2GoSession(object): if cmd is not None: self.terminal_params['cmd'] = cmd - self.terminal_session = _control.resume(session_name=self.session_name, - session_instance=self, - session_list=session_list, - logger=self.logger, **self.terminal_params) + try: + self.terminal_session = _control.resume(session_name=self.session_name, + session_instance=self, + session_list=session_list, + logger=self.logger, **self.terminal_params) + except x2go_exceptions.X2GoControlSessionException, e: + self.logger('%s' % str(e), loglevel=log.loglevel_ERROR) + self.HOOK_on_control_session_death() + self._X2GoSession__disconnect() + return False self._progress_status = 25 progress_event.set() -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org