[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.0.3-19-gb310692
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:28:34 CET 2014
The branch, build-baikal has been updated
via b310692a365a7803d58ab686ed95cb52a2db92c0 (commit)
from 2e6f672fc9127f84cbc0b9d8f42c39f0a44a0565 (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:
x2go/backends/control/_stdout.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 25e0943..c3e5725 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -188,25 +188,30 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
self.logger('executing command on X2go server: %s' % _rerewrite_blanks(cmd), loglevel)
_retval = self.exec_command(_rewrite_password(cmd, user=self.get_transport().get_username(), password=self._session_password), **kwargs)
self.locked = False
+ timeout.cancel()
except AttributeError:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
+ self.locked = False
raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
except EOFError:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
+ self.locked = False
raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
except x2go_exceptions.SSHException:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
+ self.locked = False
raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
except gevent.timeout.Timeout:
self.session_died = True
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
+ self.locked = False
raise x2go_exceptions.X2goControlSessionException('the X2go control session command timed out')
finally:
self.locked = False
@@ -696,11 +701,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
_listsessions = self._list_backend(_stdout_read, info_backend=self._info_backend).sessions
_success = True
except KeyError:
- gevent.sleep(1)
+ gevent.sleep(.2)
except IndexError:
- gevent.sleep(1)
+ gevent.sleep(.2)
except ValueError:
- gevent.sleep(1)
+ gevent.sleep(.2)
# update internal variables when list_sessions() is called
for _session_name, _session_info in self.associated_terminals.items():
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).
More information about the x2go-commits
mailing list