x2go-commits

x2go-commits@lists.x2go.org

37910 discussions

pyhoca-gui.git - build-main (branch) updated: 0.1.0.3
by git-admin＠x2go.org 22 Jun '11

22 Jun '11

The branch, build-main has been updated via 58942df85e7133cbf39e359a2efc821d7be17ae3 (commit) via 6776dbfb62c89009be269ee96b7544b01202f4ca (commit) via a47515c812d9cce9d61602d0eed4d070c4554703 (commit) via c53d704bed4c24773ebd4b04e765e86f69539396 (commit) via dd455a3b4eda3bffb0008e68fc5876798ceb3990 (commit) via 82b4fe8750c58ac81d04a4d9772809243a266236 (commit) via da63975592fcce5adf1f3e4420862b5b039d13d6 (commit) via 51ec74b6782193e13b5b5d646d211328c1d7fa4f (commit) via 2c7ce58ee48411235359846f85b93d1087b823e5 (commit) via 43f3d53d46687eed835a3202eda482738cfe1659 (commit) via c8bb328e8db95a7e9056f92909681c3ae62492bf (commit) via d215d5a8532a28e053607f2d587e949d685342a1 (commit) via b4d8418982b78220c40ffd6e9231fd037d47a516 (commit) via f77b4cb44d12122ad3d455b4baa106c285be5127 (commit) via b344d95c5629d51f7ec31cfed76e071782afe8f7 (commit) via 9575809204dd7d58d174ce9c3d286fe55b5fe004 (commit) via c8f2ebd5b8455a4ca953cd368bd515b6bcb9ac95 (commit) from cf20bd0e4f17055d90aa7cf2c88c06f6344d95f2 (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: debian/changelog | 11 +++++++++++ debian/control | 2 +- pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/frontend.py | 26 ++++++++++++++++---------- pyhoca/wxgui/logon.py | 23 ++++++++++++++--------- pyhoca/wxgui/notify.py | 6 ++++-- 6 files changed, 47 insertions(+), 23 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 132c17a..e7568a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +pyhoca-gui (0.1.0.3-0~x2go1) unstable; urgency=low + + New upstream version (0.1.0.3): + - Fix utf-8 errors during authentication. + - Release session name on connection errors when greyed out. + - Spawn initial list sessions call into background to unblock I/O + during/after authentication. + * Depend on Python X2go 0.1.1.0. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 23 Jun 2011 00:45:34 +0200 + pyhoca-gui (0.1.0.2-0~x2go1) unstable; urgency=low * New upstream release (0.1.0.2): diff --git a/debian/control b/debian/control index 72491fe..e17abed 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.0.3-0~0), + python-x2go (>=0.1.1.0-0~0), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 8cf68a8..3871e00 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.1.0.2' +__VERSION__ = '0.1.0.3' from frontend import * diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index f33d494..7fa0d22 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -318,6 +318,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def _post_authenticate(self, evt, session_uuid): _resumed = False + _dummy = self.list_sessions(session_uuid, refresh_cache=True) if self.resume_newest_on_connect: _resumed = self._resume_newest_on_connect(evt, session_uuid) elif self.resume_oldest_on_connect: @@ -356,35 +357,35 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True ) self._logon_windows[profile_name] = _logon_window except x2go.SSHException, e: - self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except x2go.X2goHostKeyException, e: - self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except x2go.X2goSSHProxyHostKeyException, e: - self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except gevent.dns.DNSError, e: - self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect error') % profile_name, e.strerror, icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except gevent.socket.error, e: - self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect error') % profile_name, e.strerror, icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: @@ -398,14 +399,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass connect_failed = True except x2go.X2goSSHProxyException, e: - self.notifier.send(_(u'%s - auth key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - auth key error') % profile_name, u'%s' % str(e), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except: - self.notifier.send('%s - connect error' % profile_name, 'An unknown error occurred during authentication!', icon='auth_error', timeout=4000) + self.notifier.send('%s - connect error' % profile_name, _(u'An unknown error occurred during authentication!'), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: @@ -526,8 +527,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # disconnect all profile sessions if self._X2goClient__server_is_alive(session_uuid): self._X2goClient__disconnect_profile(self.current_profile_name) - if not self._X2goClient__is_session_connected(session_uuid): - self.notifier.send(_(u'%s - disconnect') % self.current_profile_name, _(u'X2go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000) + self.notifier.send(_(u'%s - disconnect') % self.current_profile_name, _(u'X2go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000) if self.exit_on_disconnect: self._pyhoca_logger('Exiting %s because %s got disconnected.' % (self.appname, self.current_profile_name), loglevel=x2go.loglevel_NOTICE) self.WakeUpIdle() @@ -672,7 +672,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def HOOK_on_control_session_death(self, profile_name): self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly! Try to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000) try: - del self._temp_disabled_session_names[self.current_profile_name] + del self._temp_disabled_session_names[profile_name] except KeyError: pass if self.exit_on_disconnect: @@ -693,6 +693,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def HOOK_forwarding_tunnel_setup_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN', chain_host='UNKNOWN', chain_port=0): self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000) + try: + self._temp_disabled_session_names[profile_name].remove(session_name) + except KeyError: + pass + except ValueError: + pass if self.exit_on_disconnect: self.WakeUpIdle() self.ExitMainLoop() diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index cd2dfb0..7010d6f 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -79,8 +79,11 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): if self.sshproxy_auth: self.sshproxy_started = False + self.sshproxy_password = None self.SetTitle(_(u'%s (via %s)') % (profile_name, self.current_profile_config['sshproxyhost'])) + self.password = None + self.userLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1)) self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER, size=(120, -1)) self.passwordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1)) @@ -302,27 +305,27 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): except gevent.dns.DNSError, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect error') % self.current_profile_name, - text='%s!' % e.strerror, + text=e.strerror + '!', icon='auth_error') connect_failed = True except gevent.socket.error, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect error') % self.current_profile_name, - text='%s!' % e.strerror, + text=e.strerror + '!', icon='auth_error') connect_failed = True except x2go.X2goHostKeyException, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - host key error') % self.current_profile_name, - text='%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), + text=_(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000) connect_failed = True except x2go.X2goSSHProxyException, e: - self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000) + self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) connect_failed = True except: @@ -335,23 +338,25 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): raise self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000) - self.Close() wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) - wx.EndBusyCursor() + # Windows's GUI is more picky then Linux's GTK GUI about EndBusyCursor if cursor is not busy... + try: wx.EndBusyCursor() + except: pass if connect_failed and self._PyHocaGUI.exit_on_disconnect: self._PyHocaGUI.WakeUpIdle() self._PyHocaGUI.ExitMainLoop() if self._PyHocaGUI._X2goClient__is_session_connected(session_uuid): - _dummy = self._PyHocaGUI.list_sessions(session_uuid, refresh_cache=True) - self._PyHocaGUI._post_authenticate(evt, session_uuid) + gevent.spawn(self._PyHocaGUI._post_authenticate, evt, session_uuid) self.sshproxy_started = False del self._PyHocaGUI._logon_windows[self.current_profile_name] + + self.Close() self.Destroy() def OnCancel(self, evt): - self.Destroy() + self.Close() def Destroy(self): try: diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 3d2235d..b0a2160 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -27,6 +27,8 @@ if X2GOCLIENT_OS in ('Linux', 'Mac'): import exceptions import basepath +import x2go.utils as utils + _icons_location = basepath.icons_basepath class NotSupportedException(exceptions.StandardError): pass @@ -85,7 +87,7 @@ class libnotify_NotifierPopup(object): n.set_urgency(pynotify.URGENCY_NORMAL) n.set_timeout(timeout) - self._pyhoca_logger('[%s] %s' % (title, text), loglevel=log.loglevel_NOTICE) + self._pyhoca_logger('[%s] %s' % (title.encode(utils.get_encoding()), text.encode(utils.get_encoding())), loglevel=log.loglevel_NOTICE) if not n.show(): raise PyHocaNotificationException('could not notify user') @@ -171,7 +173,7 @@ class notificationmessage_NotifierPopup(object): # wx.NotificationMessage class pass - self._pyhoca_logger('[%s] %s' % (title, text), loglevel=log.loglevel_NOTICE) + self._pyhoca_logger('[%s] %s' % (title.encode(utils.get_encoding()), text.encode(utils.get_encoding())), loglevel=log.loglevel_NOTICE) def Close(self): pass hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-17-g58942df
by git-admin＠x2go.org 22 Jun '11

22 Jun '11

The branch, master has been updated via 58942df85e7133cbf39e359a2efc821d7be17ae3 (commit) from 6776dbfb62c89009be269ee96b7544b01202f4ca (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 ----------------------------------------------------------------- commit 58942df85e7133cbf39e359a2efc821d7be17ae3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 00:46:27 2011 +0200 Preparing release 0.1.0.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++-- debian/control | 2 +- pyhoca/wxgui/__init__.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 730420d..e7568a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -pyhoca-gui (0.1.0.3-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.1.0.3-0~x2go1) unstable; urgency=low New upstream version (0.1.0.3): - Fix utf-8 errors during authentication. - Release session name on connection errors when greyed out. - Spawn initial list sessions call into background to unblock I/O during/after authentication. + * Depend on Python X2go 0.1.1.0. - -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 12:27:07 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 23 Jun 2011 00:45:34 +0200 pyhoca-gui (0.1.0.2-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 72491fe..e17abed 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.0.3-0~0), + python-x2go (>=0.1.1.0-0~0), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 8cf68a8..3871e00 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.1.0.2' +__VERSION__ = '0.1.0.3' from frontend import * hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-16-g6776dbf
by git-admin＠x2go.org 22 Jun '11

22 Jun '11

The branch, master has been updated via 6776dbfb62c89009be269ee96b7544b01202f4ca (commit) from a47515c812d9cce9d61602d0eed4d070c4554703 (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 ----------------------------------------------------------------- commit 6776dbfb62c89009be269ee96b7544b01202f4ca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 00:43:42 2011 +0200 Fix faulty X2goClient method call on DisconnectSession. ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index f9ae74d..7fa0d22 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -527,8 +527,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # disconnect all profile sessions if self._X2goClient__server_is_alive(session_uuid): self._X2goClient__disconnect_profile(self.current_profile_name) - if not self._X2goClient__is_session_connected(session_uuid): - self.notifier.send(_(u'%s - disconnect') % self.current_profile_name, _(u'X2go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000) + self.notifier.send(_(u'%s - disconnect') % self.current_profile_name, _(u'X2go Profile is now disconnected.'), icon='auth_disconnect', timeout=4000) if self.exit_on_disconnect: self._pyhoca_logger('Exiting %s because %s got disconnected.' % (self.appname, self.current_profile_name), loglevel=x2go.loglevel_NOTICE) self.WakeUpIdle() hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-31-g2051ce5
by git-admin＠x2go.org 22 Jun '11

22 Jun '11

The branch, master has been updated via 2051ce5c73f9abe4d0124173f1bb784684202560 (commit) from d43d6a81e68a9cf3d392ff232e481a599ff82119 (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 ----------------------------------------------------------------- commit 2051ce5c73f9abe4d0124173f1bb784684202560 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 22 02:35:41 2011 +0200 Wait for 10 secs when taking over an active session, remove debug output. ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 2 +- x2go/registry.py | 1 - x2go/session.py | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index b953234..5c7ce76 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -565,7 +565,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if session_name is not None: if self.is_running(session_name): self.suspend(session_name) - gevent.sleep(3) + gevent.sleep(10) try: _success = _terminal.resume() diff --git a/x2go/registry.py b/x2go/registry.py index 1ddbac3..0281b80 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -295,7 +295,6 @@ class X2goSessionRegistry(object): # make sure the session registry gets updated before registering new session # (if the server name has changed, this will kick out obsolete X2goSessions) - print "STATUS UPDATE PROFILE: %s" % profile_name self.update_status(profile_name=profile_name, session_list=session_list) for session_name in session_list.keys(): if session_name not in _session_names: diff --git a/x2go/session.py b/x2go/session.py index f94d9fe..01441c7 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1275,4 +1275,5 @@ class X2goSession(object): """ if self.has_terminal_session(): self.terminal_session.release_proxy() + self.terminal_session.__del__() self.terminal_session = None 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).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-15-ga47515c
by git-admin＠x2go.org 22 Jun '11

22 Jun '11

The branch, master has been updated via a47515c812d9cce9d61602d0eed4d070c4554703 (commit) from c53d704bed4c24773ebd4b04e765e86f69539396 (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 ----------------------------------------------------------------- commit a47515c812d9cce9d61602d0eed4d070c4554703 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 22 02:06:34 2011 +0200 exception catcher fixed ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 21f44bd..f9ae74d 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -696,7 +696,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000) try: self._temp_disabled_session_names[profile_name].remove(session_name) - except KeyError, ValueError: + except KeyError: + pass + except ValueError: pass if self.exit_on_disconnect: self.WakeUpIdle() hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-30-gd43d6a8
by git-admin＠x2go.org 21 Jun '11

21 Jun '11

The branch, master has been updated via d43d6a81e68a9cf3d392ff232e481a599ff82119 (commit) from 982d86f3ccf7d17f6590036fd49a4e8bf127df6a (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 ----------------------------------------------------------------- commit d43d6a81e68a9cf3d392ff232e481a599ff82119 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 22 01:22:33 2011 +0200 Fix multiple notifications for the same session state change, reliably differentiate between found sessions after connect and newly started sessions from another client. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- x2go/client.py | 4 +++- x2go/registry.py | 30 +++++++++++++++++------------- x2go/session.py | 37 +++++++++++++++++++++++-------------- 4 files changed, 47 insertions(+), 29 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a3d162d..b5f5cab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,11 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low - Explicitly tunnel over IPv4 for NX proxy. - Make cache more configurable (session list updates, desktop list updates). - Adds an auto_update_listdesktops_cache to X2goClient constructor argvs. + - Fix multiple notifications for the same session state change, reliably + differentiate between found sessions after connect and newly started + sessions from another client. - -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 19:48:12 +0200 + -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Wed, 22 Jun 2011 01:20:48 +0200 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low diff --git a/x2go/client.py b/x2go/client.py index fa87e4c..0141d73 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1056,7 +1056,9 @@ class X2goClient(object): force_password_auth=force_password_auth, ) if self.auto_register_sessions: - self.session_registry.register_available_server_sessions(profile_name=self.get_session_profile_name(session_uuid)) + self.session_registry.register_available_server_sessions(profile_name=self.get_session_profile_name(session_uuid), + newly_connected=True, + ) __connect_session = connect_session def disconnect_session(self, session_uuid): diff --git a/x2go/registry.py b/x2go/registry.py index 033a631..1ddbac3 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -182,7 +182,7 @@ class X2goSessionRegistry(object): _session_summary['terminated'] = None return _session_summary - def update_status(self, session_uuid=None, profile_name=None, profile_id=None, session_list=None, force_update=False): + def update_status(self, session_uuid=None, profile_name=None, profile_id=None, session_list=None, force_update=False, newly_connected=False): """\ Update the session status for L{X2goSession} that is represented by a given session UUID hash, profile name or profile ID. @@ -216,7 +216,9 @@ class X2goSessionRegistry(object): for _session_uuid in session_uuids: - self(_session_uuid).update_status(session_list=session_list, force_update=force_update) + if not self(_session_uuid).update_status(session_list=session_list, force_update=force_update): + # skip this run, as nothing has changed since the last time... + return False _last_status = copy.deepcopy(self(_session_uuid)._last_status) _current_status = copy.deepcopy(self(_session_uuid)._current_status) @@ -234,9 +236,12 @@ class X2goSessionRegistry(object): if len(self.virgin_sessions_of_profile_name(profile_name)) > 1: del self.registry[_session_uuid] - elif _last_status['running'] == False and _current_status['running'] == True and _current_status['faulty'] == False: + elif not _last_status['running'] and _current_status['running'] and not _current_status['faulty']: # session has started - if _last_status['connected']: + if newly_connected: + # from a suspended state + self.client_instance.HOOK_on_found_session_running_after_connect(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name) + else: if self(_session_uuid).has_terminal_session(): if _last_status['suspended']: # from a suspended state @@ -251,15 +256,12 @@ class X2goSessionRegistry(object): else: # as a new session self.client_instance.HOOK_on_session_has_started_by_other(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name) - else: - # from a suspended state - self.client_instance.HOOK_on_found_session_running_after_connect(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name) - elif _last_status['connected'] == True and (_last_status['suspended'] == False and _current_status['suspended'] == True) and _current_status['faulty'] == False: + elif _last_status['connected'] and (not _last_status['suspended'] and _current_status['suspended']) and not _current_status['faulty']: # session has been suspended self(_session_uuid).session_cleanup() self.client_instance.HOOK_on_session_has_been_suspended(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name) - elif _last_status['connected'] == True and (_last_status['terminated'] == False and _current_status['terminated'] == True) and _current_status['faulty'] == False: + elif _last_status['connected'] and (not _last_status['terminated'] and _current_status['terminated']) and not _current_status['faulty']: # session has terminated self.client_instance.HOOK_on_session_has_terminated(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name) self(_session_uuid).session_cleanup() @@ -267,7 +269,9 @@ class X2goSessionRegistry(object): if len(self.virgin_sessions_of_profile_name(profile_name)) > 1: del self.registry[_session_uuid] - def register_available_server_sessions(self, profile_name, session_list=None): + return True + + def register_available_server_sessions(self, profile_name, session_list=None, newly_connected=False): """\ Register server-side available X2go sessions with this L{X2goSessionRegistry} instance for a given profile name. @@ -291,6 +295,7 @@ class X2goSessionRegistry(object): # make sure the session registry gets updated before registering new session # (if the server name has changed, this will kick out obsolete X2goSessions) + print "STATUS UPDATE PROFILE: %s" % profile_name self.update_status(profile_name=profile_name, session_list=session_list) for session_name in session_list.keys(): if session_name not in _session_names: @@ -324,12 +329,11 @@ class X2goSessionRegistry(object): # this if clause catches problems when x2golistsessions commands give weird results if not self.has_session_of_session_name(session_name): session_uuid = self.register(server, profile_id, profile_name, - session_name=session_name, - virgin=False, running=False, suspended=True, terminated=None, + session_name=session_name, virgin=False, **kwargs ) self(session_uuid).connected = True - self.update_status(session_uuid=session_uuid, session_list=session_list, force_update=True) + self.update_status(session_uuid=session_uuid, force_update=True, newly_connected=newly_connected) def register(self, server, profile_id, profile_name, session_name=None, diff --git a/x2go/session.py b/x2go/session.py index 0767340..f94d9fe 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -114,7 +114,7 @@ class X2goSession(object): add_to_known_hosts=False, known_hosts=None, logger=None, loglevel=log.loglevel_DEFAULT, - virgin=True, running=None, suspended=None, terminated=None, faulty=None, + connected=False, virgin=True, running=None, suspended=None, terminated=None, faulty=None, client_instance=None, **params): """\ @@ -168,6 +168,8 @@ class X2goSession(object): @type add_to_known_hosts: C{bool} @param known_hosts: the underlying Paramiko/SSH systems C{known_hosts} file @type known_hosts: C{str} + @param connected: manipulate session state »connected« by giving a pre-set value + @type connected: C{bool} @param virgin: manipulate session state »virgin« by giving a pre-set value @type virgin: C{bool} @param running: manipulate session state »running« by giving a pre-set value @@ -193,7 +195,7 @@ class X2goSession(object): self._keep = None self.uuid = uuid.uuid1() - self.connected = False + self.connected = connected self.virgin = virgin self.running = running @@ -207,16 +209,6 @@ class X2goSession(object): self.session_name = session_name self.server = server - self._current_status = { - 'timestamp': time.time(), - 'server': self.server, - 'virgin': self.virgin, - 'connected': self.connected, - 'running': self.running, - 'suspended': self.suspended, - 'terminated': self.terminated, - 'faulty': self.faulty, - } self._last_status = None self.printing = printing @@ -264,6 +256,17 @@ class X2goSession(object): self.known_hosts = known_hosts self.use_sshproxy = use_sshproxy + self._current_status = { + 'timestamp': time.time(), + 'server': self.server, + 'virgin': self.virgin, + 'connected': self.connected, + 'running': self.running, + 'suspended': self.suspended, + 'terminated': self.terminated, + 'faulty': self.faulty, + } + self.init_control_session() self.terminal_session = None @@ -726,8 +729,10 @@ class X2goSession(object): self.disconnect() _dummy = self.get_server_hostname() + if self.connected: self.update_status() + return self.connected __connect = connect @@ -868,7 +873,7 @@ class X2goSession(object): # skip this session status update if not longer than a second ago... if _status_update_timedelta < 1: self.logger('status update interval too short (%s), skipping status about this time...' % _status_update_timedelta, loglevel=log.loglevel_DEBUG) - return + return False e = None self._last_status = copy.deepcopy(self._current_status) @@ -890,7 +895,7 @@ class X2goSession(object): self.running = _session_info.is_running() self.suspended = _session_info.is_suspended() if not self.virgin: - self.terminated = not (_session_info.is_running() or _session_info.is_suspended()) + self.terminated = not (self.running or self.suspended) else: self.terminated = None except KeyError: @@ -898,6 +903,8 @@ class X2goSession(object): self.suspended = False if not self.virgin: self.terminated = True + self.faulty = not (self.running or self.suspended or self.terminated or self.virgin) + self._current_status = { 'timestamp': time.time(), @@ -913,6 +920,8 @@ class X2goSession(object): if (not self.connected or self.faulty) and e: raise e + return True + __update_status = update_status def resume(self, session_name=None): 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).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-29-g982d86f
by git-admin＠x2go.org 21 Jun '11

21 Jun '11

The branch, master has been updated via 982d86f3ccf7d17f6590036fd49a4e8bf127df6a (commit) from 1864f206b495fe38b2b9e6e2569de1b215279de0 (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 ----------------------------------------------------------------- commit 982d86f3ccf7d17f6590036fd49a4e8bf127df6a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 21 20:11:23 2011 +0200 Add X2goTimeOutException ----------------------------------------------------------------------- Summary of changes: x2go/x2go_exceptions.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py index e211836..9b7b3eb 100644 --- a/x2go/x2go_exceptions.py +++ b/x2go/x2go_exceptions.py @@ -61,6 +61,7 @@ class X2goSSHProxyException(_X2goException): pass class X2goSSHProxyAuthenticationException(_X2goException): pass class X2goNotImplementedYetException(_X2goException): pass class X2goDesktopSharingException(_X2goException): pass +class X2goTimeOutException(_X2goException): pass if _X2GOCLIENT_OS != 'Windows': # faking Windows errors on non-Windows systems... class WindowsError(_X2goException): pass 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).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-28-g1864f20
by git-admin＠x2go.org 21 Jun '11

21 Jun '11

The branch, master has been updated via 1864f206b495fe38b2b9e6e2569de1b215279de0 (commit) from 40032c72120c5b58f9135488f3120902fce77e7a (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 ----------------------------------------------------------------- commit 1864f206b495fe38b2b9e6e2569de1b215279de0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 21 19:50:10 2011 +0200 Make cache more configurable (session list updates, desktop list updates), add an auto_update_listdesktops_cache to X2goClient constructor argvs. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++- x2go/backends/control/_stdout.py | 41 ++++++++++++++++++----- x2go/cache.py | 30 +++++++++++++---- x2go/client.py | 68 +++++++++++++++++++++++++++++++------ x2go/guardian.py | 8 ++++- x2go/session.py | 5 +++ 6 files changed, 128 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b34e4bd..a3d162d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,12 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low - Add X2goSession status property ,,faulty''. - Make sure list session and list desktop commands always return. - Rely on X2goSessionListInfo backend to handle exceptions appropriately. - - Assure that rev forwarding tunnels use IPv4 (replace localhost with 127.0.0.1) + - Assure that rev forwarding tunnels use IPv4 (replace localhost with 127.0.0.1). - Explicitly tunnel over IPv4 for NX proxy. + - Make cache more configurable (session list updates, desktop list updates). + - Adds an auto_update_listdesktops_cache to X2goClient constructor argvs. - -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 15:39:08 +0200 + -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 19:48:12 +0200 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index d6ebe72..b953234 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -626,7 +626,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return self.start(**kwargs) - def list_desktops(self, raw=False): + def list_desktops(self, raw=False, maxwait=20): """\ List all desktop-like sessions of current user (or of users that have granted desktop sharing) on the connected server. @@ -648,10 +648,19 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): # this _success loop will catch errors in case the x2golistsessions output is corrupt # this should not be needed and is a workaround for the current X2go server implementation - (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistdesktops") - _stdout_read = stdout.read() - - _listdesktops = _stdout_read.split('\n') + timeout = gevent.Timeout(maxwait) + timeout.start() + try: + (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistdesktops") + _stdout_read = stdout.read() + _listdesktops = _stdout_read.split('\n') + except gevent.timeout.Timeout: + # if we do not get a reply here after <maxwait> seconds we will raise a time out, we have to + # make sure that we catch this at places where we want to ignore timeouts (e.g. in the + # desktop list cache) + raise x2go_exceptions.X2goTimeOutException('x2golistdesktop command timed out') + finally: + timeout.cancel() return _listdesktops @@ -681,10 +690,24 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): _success = False _count = 0 - (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions") - _stdout_read = stdout.read() - - _listsessions = self._list_backend(_stdout_read, info_backend=self._info_backend).sessions + # we will try this 20 times before giving up... we might simply catch the x2golistsessions + # output in the middle of creating a session in the database... + while not _success and _count < 20: + _count += 1 + try: + (stdin, stdout, stderr) = self._x2go_exec_command("export HOSTNAME && x2golistsessions") + _stdout_read = stdout.read() + _listsessions = self._list_backend(_stdout_read, info_backend=self._info_backend).sessions + _success = True + except KeyError: + gevent.sleep(1) + except IndexError: + gevent.sleep(1) + except ValueError: + gevent.sleep(1) + + if _count >= 20: + raise x2go_exceptions.X2goControlSessionException('x2golistsessions command failed after we have tried 20 times') # update internal variables when list_sessions() is called for _session_name, _session_info in self.associated_terminals.items(): diff --git a/x2go/cache.py b/x2go/cache.py index dda6faa..2a8643b 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -94,30 +94,41 @@ class X2goListSessionsCache(object): if profile_name not in self.client_instance.client_connected_profiles(return_profile_names=True): del self.x2go_listsessions_cache[profile_name] - def update_all(self): + def update_all(self, update_sessions=True, update_desktops=False): """\ Update L{X2goListSessionsCache} for all connected session profiles. + @param update_sessions: cache recent session lists from all connected servers + @type update_session: C{bool} + @param update_desktops: cache recent desktop lists from all connected servers + @type update_desktops: C{bool} + """ for profile_name in self.client_instance.client_connected_profiles(return_profile_names=True): - self.update(profile_name) + self.update(profile_name, update_sessions=update_sessions, update_desktops=update_desktops) self.check_cache() - def update(self, profile_name): + def update(self, profile_name, update_sessions=True, update_desktops=False): """\ Update L{X2goListSessionsCache} (i.e. session/desktops) for session profile C{profile_name}. @param profile_name: name of profile to update @type profile_name: C{str} + @param update_sessions: cache recent session list from server + @type update_session: C{bool} + @param update_desktops: cache recent desktop list from server + @type update_desktops: C{bool} """ self.last_listsessions_cache = copy.deepcopy(self.x2go_listsessions_cache) control_session = self.client_instance.client_control_session_of_profile_name(profile_name) if not self.x2go_listsessions_cache.has_key(profile_name): self.x2go_listsessions_cache[profile_name] = {'sessions': None, 'desktops': None, } - self._update_sessions(profile_name, control_session) - self._update_desktops(profile_name, control_session) + if update_sessions: + self._update_sessions(profile_name, control_session) + if update_desktops: + self._update_desktops(profile_name, control_session) def _update_desktops(self, profile_name, control_session): """\ @@ -188,7 +199,7 @@ class X2goListSessionsCache(object): else: return None - def is_cached(self, profile_name=None, session_uuid=None): + def is_cached(self, profile_name=None, session_uuid=None, cache_type=None): """\ Check if session list is cached. @@ -200,4 +211,9 @@ class X2goListSessionsCache(object): """ if profile_name is None and session_uuid: profile_name = self.client_instance.get_session_profile_name(session_uuid) - return self.x2go_listsessions_cache.has_key(profile_name) + _is_profile_cached = self.x2go_listsessions_cache.has_key(profile_name) + _is_cache_type_cached = _is_profile_cached and self.x2go_listsessions_cache[profile_name].has_key(cache_type) + if cache_type is None: + return _is_profile_cached + else: + return _is_cache_type_cached \ No newline at end of file diff --git a/x2go/client.py b/x2go/client.py index ae4dec1..fa87e4c 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -193,6 +193,7 @@ class X2goClient(object): start_pulseaudio=False, use_listsessions_cache=False, auto_update_listsessions_cache=False, + auto_update_listdesktops_cache=False, auto_update_sessionregistry=False, auto_register_sessions=False, refresh_interval=5, @@ -225,10 +226,12 @@ class X2goClient(object): @type start_xserver: C{bool} @param start_pulseaudio: start Pulseaudio daemon when registering an L{X2goClient} instance @type start_pulseaudio: C{bool} - @param use_listsessions_cache: activate the X2go session list cache (L{X2goListSessionsCache}) + @param use_listsessions_cache: activate the X2go session list cache in (L{X2goListSessionsCache}) @type use_listsessions_cache: C{bool} @param auto_update_listsessions_cache: activate automatic updates of the X2go session list cache (L{X2goListSessionsCache}) @type auto_update_listsessions_cache: C{bool} + @param auto_update_listdesktops_cache: activate automatic updates of desktop lists in (L{X2goListSessionsCache}) + @type auto_update_listdesktops_cache: C{bool} @param auto_update_sessionregistry: activate automatic updates of the X2go session registry @type auto_update_sessionregistry: C{bool} @param auto_register_sessions: activate automatic X2go session registration @@ -309,16 +312,20 @@ class X2goClient(object): self.auto_register_sessions = auto_register_sessions self.session_registry = X2goSessionRegistry(self, logger=self.logger) - self.session_guardian = X2goSessionGuardian(self, auto_update_listsessions_cache=auto_update_listsessions_cache & use_listsessions_cache, + self.session_guardian = X2goSessionGuardian(self, auto_update_listsessions_cache=auto_update_listsessions_cache & use_listsessions_cache, + auto_update_listdesktops_cache=auto_update_listdesktops_cache & use_listsessions_cache, auto_update_sessionregistry=auto_update_sessionregistry, auto_register_sessions=auto_register_sessions, refresh_interval=refresh_interval, logger=self.logger ) + if use_listsessions_cache: self.listsessions_cache = X2goListSessionsCache(self, logger=self.logger) self.use_listsessions_cache = use_listsessions_cache + self.auto_update_listsessions_cache = auto_update_listsessions_cache + self.auto_update_listdesktops_cache = auto_update_listdesktops_cache # user hooks for detecting/notifying what happened during application runtime def HOOK_no_known_xserver_found(self): @@ -1869,7 +1876,7 @@ class X2goClient(object): if raw: return self.session_registry(session_uuid).list_sessions(raw=raw) - if not self.use_listsessions_cache or no_cache: + if not self.use_listsessions_cache or not self.auto_update_listsessions_cache or no_cache: _session_list = self.session_registry(session_uuid).list_sessions() elif refresh_cache: self.update_cache_by_session_uuid(session_uuid) @@ -1877,7 +1884,7 @@ class X2goClient(object): else: # if there is no cache for this session_uuid available, make sure the cache gets updated # before reading from it... - if self.use_listsessions_cache and (not self.listsessions_cache.is_cached(session_uuid=session_uuid)): + if self.use_listsessions_cache and (not self.listsessions_cache.is_cached(session_uuid=session_uuid, cache_type=('sessions'))): self.__update_cache_by_session_uuid(session_uuid) _session_list = self.listsessions_cache.list_sessions(session_uuid) @@ -1938,9 +1945,11 @@ class X2goClient(object): if raw: return self.session_registry(session_uuid).list_desktops(raw=raw) - if not self.use_listsessions_cache or no_cache: + if not self.use_listsessions_cache or not self.auto_update_listdesktops_cache or no_cache: _desktop_list = self.session_registry(session_uuid).list_desktops() else: + if self.use_listsessions_cache and (not self.listsessions_cache.is_cached(session_uuid=session_uuid, cache_types=('desktops'))): + self.__update_cache_by_session_uuid(session_uuid, update_sessions=False, update_desktops=True) _desktop_list = self.listsessions_cache.list_desktops(session_uuid) return _desktop_list @@ -2156,45 +2165,82 @@ class X2goClient(object): __update_sessionregistry_status_all_profiles = update_sessionregistry_status_all_profiles - def update_cache_by_profile_name(self, profile_name): + def update_cache_by_profile_name(self, profile_name, cache_types=('sessions'), update_sessions=None, update_desktops=None): """\ Update the session list cache by profile name. @param profile_name: the X2go session profile name @type profile_name: C{str} + @param cache_types: specify what cache type to update (available: C{sessions}, C{desktops}) + @type cache_types: C{tuple} or C{list} + @param update_sessions: instead of giving a list of cache types, plainly say C{True} here, if + you want to update sessions in the session list cache. + @type update_session: C{bool} + @param update_desktops: instead of giving a list of cache types, plainly say C{True} here, if + you want to update available desktops in the desktop list cache. + @type update_desktops: C{bool} """ if self.listsessions_cache is not None: + _update_sessions = ('sessions' in cache_types) or update_sessions + _update_desktops = ('desktops' in cache_types) or update_desktops try: - self.listsessions_cache.update(profile_name) + self.listsessions_cache.update(profile_name, update_sessions=_update_sessions, update_desktops=_update_desktops) except x2go_exceptions.X2goControlSessionException: if self.disconnect_profile(profile_name): self.HOOK_on_control_session_death(profile_name) __update_cache_by_profile_name = update_cache_by_profile_name - def update_cache_by_session_uuid(self, session_uuid): + def update_cache_by_session_uuid(self, session_uuid, cache_types=('sessions'), update_sessions=None, update_desktops=None): """\ Update the session list cache of a specific L{X2goSession} instance with session identifier <session_uuid>. @param session_uuid: the X2go session's UUID registry hash @type session_uuid: C{str} + @param cache_types: specify what cache type to update (available: C{sessions}, C{desktops}) + @type cache_types: C{tuple} or C{list} + @param update_sessions: instead of giving a list of cache types, plainly say C{True} here, if + you want to update sessions in the session list cache. + @type update_session: C{bool} + @param update_desktops: instead of giving a list of cache types, plainly say C{True} here, if + you want to update available desktops in the desktop list cache. + @type update_desktops: C{bool} """ profile_name = self.get_session_profile_name(session_uuid) - self.__update_cache_by_profile_name(profile_name) + self.__update_cache_by_profile_name(profile_name, + cache_types=cache_types, + update_sessions=update_sessions, + update_desktops=update_desktops, + ) __update_cache_by_session_uuid = update_cache_by_session_uuid - def update_cache_all_profiles(self): + def update_cache_all_profiles(self, cache_types=('sessions'), update_sessions=None, update_desktops=None): """\ Update the session list cache of all session profiles. + @param cache_types: specify what cache type to update (available: C{sessions}, C{desktops}) + @type cache_types: C{tuple} or C{list} + @param update_sessions: instead of giving a list of cache types, plainly say C{True} here, if + you want to update sessions in the session list cache. + @type update_session: C{bool} + @param update_desktops: instead of giving a list of cache types, plainly say C{True} here, if + you want to update available desktops in the desktop list cache. + @type update_desktops: C{bool} + """ if self.listsessions_cache is not None: for profile_name in self.client_connected_profiles(return_profile_names=True): - self.__update_cache_by_profile_name(profile_name) + self.__update_cache_by_profile_name(profile_name, + cache_types=cache_types, + update_sessions=update_sessions, + update_desktops=update_desktops, + ) + # remove profiles that are not connected any more from cache object self.listsessions_cache.check_cache() + __update_cache_all_profiles = update_cache_all_profiles def register_available_server_sessions_by_profile_name(self, profile_name): diff --git a/x2go/guardian.py b/x2go/guardian.py index 36b0623..a5791e3 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -54,6 +54,7 @@ class X2goSessionGuardian(threading.Thread): def __init__(self, client_instance, auto_update_listsessions_cache=False, + auto_update_listdesktops_cache=False, auto_update_sessionregistry=False, auto_register_sessions=False, refresh_interval=5, @@ -61,6 +62,8 @@ class X2goSessionGuardian(threading.Thread): """\ @param auto_update_listsessions_cache: let L{X2goSessionGuardian} refresh the session list cache for all L{X2goSession} objects @type auto_update_listsessions_cache: C{bool} + @param auto_update_listdesktops_cache: let L{X2goSessionGuardian} refresh desktop lists in the session list cache for all L{X2goSession} objects + @type auto_update_listdesktops_cache: C{bool} @param auto_update_sessionregistry: if set to C{True} the session status will be updated in regular intervals @type auto_update_sessionregistry: C{bool} @param auto_register_sessions: register new sessions automatically once they appear in the X2go session (e.g. @@ -83,6 +86,7 @@ class X2goSessionGuardian(threading.Thread): self.client_instance = client_instance self.auto_update_listsessions_cache = auto_update_listsessions_cache + self.auto_update_listdesktops_cache = auto_update_listdesktops_cache self.auto_update_sessionregistry = auto_update_sessionregistry self.auto_register_sessions = auto_register_sessions self.refresh_interval = refresh_interval @@ -110,7 +114,9 @@ class X2goSessionGuardian(threading.Thread): if self.auto_update_listsessions_cache: - self.client_instance.update_cache_all_profiles() + self.client_instance.update_cache_all_profiles(update_sessions=self.auto_update_listsessions_cache, + update_desktops=self.auto_update_listdesktops_cache, + ) if self.auto_update_sessionregistry and not self.auto_register_sessions: self.client_instance.update_sessionregistry_status_all_profiles() diff --git a/x2go/session.py b/x2go/session.py index 52cb682..0767340 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -831,6 +831,11 @@ class X2goSession(object): """ try: return self.control_session.list_desktops(raw=raw) + except X2goDesktopSharingException: + if raw: + return ('','') + else: + return [] except X2goControlSessionException: self._X2goSession_disconnect() return None 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).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-27-g40032c7
by git-admin＠x2go.org 21 Jun '11

21 Jun '11

The branch, master has been updated via 40032c72120c5b58f9135488f3120902fce77e7a (commit) from 81b1dbb0b4b0689c7170e8e6c6dda89315e99ba7 (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 ----------------------------------------------------------------- commit 40032c72120c5b58f9135488f3120902fce77e7a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 21 15:39:47 2011 +0200 Explicitly tunnel over IPv4 for NX proxy. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2go/backends/proxy/_nx3.py | 6 +++--- x2go/forward.py | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6fd3b8f..b34e4bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low - Make sure list session and list desktop commands always return. - Rely on X2goSessionListInfo backend to handle exceptions appropriately. - Assure that rev forwarding tunnels use IPv4 (replace localhost with 127.0.0.1) + - Explicitly tunnel over IPv4 for NX proxy. - -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 15:23:49 +0200 + -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 15:39:08 +0200 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index 38786af..5f1f30f 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -80,7 +80,7 @@ class X2goProxyNX3(base.X2goProxyBASE): "nx/nx" , "retry=5", "composite=1", - "connect=localhost", + "connect=127.0.0.1", "clipboard=1", "cookie=%s" % self.session_info.cookie, "port=%d" % self.session_info.graphics_port, @@ -91,7 +91,7 @@ class X2goProxyNX3(base.X2goProxyBASE): "nx/nx" , "retry=5", "composite=1", - "connect=localhost", + "connect=127.0.0.1", "clipboard=1", "cookie=%s" % self.session_info.cookie, "port=%d" % self.session_info.graphics_port, @@ -167,7 +167,7 @@ options=%s""" % ( self.proxy_options['xkbrules'], def start_proxy(self): self.logger('starting local NX3 proxy...', loglevel=log.loglevel_INFO) - self.logger('NX3 Proxy mode is server, cookie=%s, host=localhost, port=%s.' % (self.session_info.cookie, self.session_info.graphics_port,), loglevel=log.loglevel_DEBUG) + self.logger('NX3 Proxy mode is server, cookie=%s, host=127.0.0.1, port=%s.' % (self.session_info.cookie, self.session_info.graphics_port,), loglevel=log.loglevel_DEBUG) self.logger('NX3 proxy writes session log to %s.' % os.path.join(self.session_info.local_container, 'session.log'), loglevel=log.loglevel_DEBUG) p = base.X2goProxyBASE.start_proxy(self) diff --git a/x2go/forward.py b/x2go/forward.py index a1adefe..6786886 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -50,7 +50,7 @@ class X2goFwServer(StreamServer): """\ @param listener: listen on TCP/IP socket C{(<IP>, <Port>)} @type listener: C{tuple} - @param remote_host: hostname or IP of remote host (in case of X2go mostly localhost) + @param remote_host: hostname or IP of remote host (in case of X2go mostly 127.0.0.1) @type remote_host: C{str} @param remote_port: port of remote host @type remote_port: C{int} @@ -143,8 +143,8 @@ class X2goFwServer(StreamServer): self.chan.close() -def start_forward_tunnel(local_host='localhost', local_port=22022, - remote_host='localhost', remote_port=22, +def start_forward_tunnel(local_host='127.0.0.1', local_port=22022, + remote_host='127.0.0.1', remote_port=22, ssh_transport=None, session_instance=None, logger=None, ): 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).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-26-g81b1dbb
by git-admin＠x2go.org 21 Jun '11

21 Jun '11

The branch, master has been updated via 81b1dbb0b4b0689c7170e8e6c6dda89315e99ba7 (commit) from b43c50f7a6d7a9810f7ef5b7d7e5e53bc10f550d (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 ----------------------------------------------------------------- commit 81b1dbb0b4b0689c7170e8e6c6dda89315e99ba7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 21 15:24:35 2011 +0200 Assure that rev forwarding tunnels use IPv4 (replace localhost with 127.0.0.1) ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2go/backends/terminal/_stdout.py | 6 +++--- x2go/rforward.py | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 46ecd2b..6fd3b8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low - Add X2goSession status property ,,faulty''. - Make sure list session and list desktop commands always return. - Rely on X2goSessionListInfo backend to handle exceptions appropriately. + - Assure that rev forwarding tunnels use IPv4 (replace localhost with 127.0.0.1) - -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 15:07:56 +0200 + -- Mike Gabriel <mike(a)mimino.das-netzwerkteam.de> Tue, 21 Jun 2011 15:23:49 +0200 python-x2go (0.1.0.3-0~x2go1) unstable; urgency=low diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index cc9d0db..3bd081c 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -388,7 +388,7 @@ class X2goTerminalSessionSTDOUT(object): ### if os.path.exists(os.path.normpath('%s/.pulse-cookie' % _LOCAL_HOME)): # setup pulse client config file on X2go server - cmd_line = "echo 'default-server=localhost:%s'>%s/.pulse-client.conf;" % (self.session_info.snd_port, self.session_info.remote_container) + \ + cmd_line = "echo 'default-server=127.0.0.1:%s'>%s/.pulse-client.conf;" % (self.session_info.snd_port, self.session_info.remote_container) + \ "echo 'cookie-file=%s/.pulse-cookie'>>%s/.pulse-client.conf" % (self.session_info.remote_container, self.session_info.remote_container) (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) @@ -396,7 +396,7 @@ class X2goTerminalSessionSTDOUT(object): # start reverse SSH tunnel for pulse stream _tunnel = rforward.X2goRevFwTunnel(server_port=self.session_info.snd_port, - remote_host='localhost', + remote_host='127.0.0.1', remote_port=self.snd_port, ssh_transport=self.control_session.get_transport(), session_instance=self.session_instance, @@ -422,7 +422,7 @@ class X2goTerminalSessionSTDOUT(object): # start reverse SSH tunnel for pulse stream _tunnel = rforward.X2goRevFwTunnel(server_port=self.session_info.snd_port, - remote_host='localhost', + remote_host='127.0.0.1', remote_port=self.snd_port, ssh_transport=self.control_session.get_transport(), session_instance=self.session_instance, diff --git a/x2go/rforward.py b/x2go/rforward.py index 6259a83..0388b85 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -91,7 +91,7 @@ class X2goRevFwTunnel(threading.Thread): normally some number above 30000 @type server_port: int @param remote_host: the target address for reversely tunneled traffic. With X2go this should - always be set to the localhost address. + always be set to the localhost (IPv4) address. @type remote_host: str @param remote_port: the TCP/IP port on the X2go client (end point of the tunnel), normally an application's standard port (22 for SSH, 4713 for pulse audio, etc.) @@ -246,15 +246,15 @@ class X2goRevFwTunnel(threading.Thread): self.incoming_channel.acquire() - self.logger('waiting for incoming data channel on X2go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) + self.logger('waiting for incoming data channel on X2go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) self.incoming_channel.wait() if self._keepalive: - self.logger('detected incoming data channel on X2go server port: [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) + self.logger('detected incoming data channel on X2go server port: [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) _chan = self.ssh_transport.accept() - self.logger('data channel %s for server port [localhost]:%s is up' % (_chan, self.server_port), loglevel=log.loglevel_DEBUG) + self.logger('data channel %s for server port [127.0.0.1]:%s is up' % (_chan, self.server_port), loglevel=log.loglevel_DEBUG) else: - self.logger('closing down rev forwarding tunnel on remote end [localhost]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) + self.logger('closing down rev forwarding tunnel on remote end [127.0.0.1]:%s' % self.server_port, loglevel=log.loglevel_DEBUG) self.incoming_channel.release() if self._accept_channels and self._keepalive: 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).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits