x2go-commits November 2012

x2go-commits@lists.x2go.org

1 participants
327 discussions

pyhoca-gui.git - master (branch) updated: 0.2.0.4-96-gf4e389a
by git-admin＠x2go.org 17 Nov '12

17 Nov '12

The branch, master has been updated via f4e389a0769997fb983504ee5d33336519b3c17a (commit) from a5593b2e7efc3b6e6e9c994e2cc16f4f141ff1a7 (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 f4e389a0769997fb983504ee5d33336519b3c17a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 17 01:41:36 2012 +0100 add no_auto_register_pubapp_sessions and set it to True ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 1 + 1 file changed, 1 insertion(+) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index c4c4982..c295a5e 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -180,6 +180,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): 'auto_update_listmounts_cache': True, 'auto_update_sessionregistry': True, 'auto_register_sessions': True, + 'no_auto_register_pubapp_sessions': True, 'logger': self._pyhoca_liblogger, } if self.args.backend_controlsession is not None: 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.2.0.10-77-g5ba7271
by git-admin＠x2go.org 17 Nov '12

17 Nov '12

The branch, master has been updated via 5ba7271ccdfd828b3c045b4b6878a56df6336c2e (commit) from 564bc7cc97eccfc1ddca356a2bf52b093b9004a3 (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 5ba7271ccdfd828b3c045b4b6878a56df6336c2e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 17 01:40:42 2012 +0100 Add option to disable auto-registration of pubapp sessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/client.py | 24 ++++++++++++++++++------ x2go/guardian.py | 3 ++- x2go/registry.py | 6 ++++-- 4 files changed, 25 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9ef6745..3cd247b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Use threading.Lock to prohibit simultaneous calls of get_published_applications() of control sessions. - Implement some internal locking for X2goSession objects. + - Add option to disable auto-registration of pubapp sessions. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/client.py b/x2go/client.py index 62da464..2429cb9 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -200,6 +200,7 @@ class X2goClient(object): auto_update_listmounts_cache=False, auto_update_sessionregistry=False, auto_register_sessions=False, + no_auto_register_pubapp_sessions=False, refresh_interval=5, pulseaudio_installdir=os.path.join(os.getcwd(), 'pulseaudio'), logger=None, loglevel=log.loglevel_DEFAULT): @@ -244,6 +245,8 @@ class X2goClient(object): @type auto_update_sessionregistry: C{bool} @param auto_register_sessions: activate automatic X2Go session registration @type auto_register_sessions: C{bool} + @param no_auto_register_pubapp_sessions: skip automatic X2Go session registration for suspended/running published applications sessions + @type no_auto_register_pubapp_sessions: C{bool} @param refresh_interval: refresh session list cache and session status every C{refresh_interval} seconds @type refresh_interval: C{int} @param pulseaudio_installdir: install path of Pulseaudio binary @@ -346,12 +349,14 @@ class X2goClient(object): self.pulseaudio = X2goPulseAudio(path=self.pulseaudio_installdir, client_instance=self, logger=self.logger) self.auto_register_sessions = auto_register_sessions + self.no_auto_register_pubapp_sessions = no_auto_register_pubapp_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|use_cache), auto_update_listdesktops_cache=auto_update_listdesktops_cache & use_listsessions_cache, auto_update_listmounts_cache=auto_update_listmounts_cache & use_listsessions_cache, auto_update_sessionregistry=auto_update_sessionregistry, auto_register_sessions=auto_register_sessions, + no_auto_register_pubapp_sessions=no_auto_register_pubapp_sessions, refresh_interval=refresh_interval, logger=self.logger ) @@ -2950,7 +2955,7 @@ class X2goClient(object): __update_cache_all_profiles = update_cache_all_profiles - def register_available_server_sessions_by_profile_name(self, profile_name, re_register=False): + def register_available_server_sessions_by_profile_name(self, profile_name, re_register=False, skip_pubapp_sessions=False): """\ Register available sessions that are found on the X2Go server the profile of name C{profile_name} is connected to. @@ -2959,6 +2964,8 @@ class X2goClient(object): @type profile_name: C{str} @param re_register: re-register available sessions, needs to be done after session profile changes @type re_register: C{bool} + @param skip_pubapp_sessions: Do not auto-register published applications sessions. + @type skip_pubapp_sessions: C{bool} """ if profile_name not in self.client_connected_profiles(return_profile_names=True): @@ -2968,34 +2975,39 @@ class X2goClient(object): register_sessions=False, ) try: - self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register) + self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register, skip_pubapp_sessions=skip_pubapp_sessions) except x2go_exceptions.X2goControlSessionException, e: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) raise e __register_available_server_sessions_by_profile_name = register_available_server_sessions_by_profile_name - def register_available_server_sessions_by_session_uuid(self, session_uuid): + def register_available_server_sessions_by_session_uuid(self, session_uuid, skip_pubapp_sessions=False): """\ Register available sessions that are found on the X2Go server that the L{X2goSession} instance with session identifier <session_uuid> is connected to. @param session_uuid: the X2Go session's UUID registry hash @type session_uuid: C{str} + @param skip_pubapp_sessions: Do not auto-register published applications sessions. + @type skip_pubapp_sessions: C{bool} """ profile_name = self.get_session_profile_name(session_uuid) - self.__register_available_server_sessions_by_profile_name(profile_name) + self.__register_available_server_sessions_by_profile_name(profile_name, skip_pubapp_sessions=skip_pubapp_sessions) __register_available_server_sessions_by_session_uuid = register_available_server_sessions_by_session_uuid - def register_available_server_sessions_all_profiles(self): + def register_available_server_sessions_all_profiles(self, skip_pubapp_sessions=False): """\ Register all available sessions found on an X2Go server for each session profile. + @param skip_pubapp_sessions: Do not auto-register published applications sessions. + @type skip_pubapp_sessions: C{bool} + """ for profile_name in self.client_connected_profiles(return_profile_names=True): try: - self.__register_available_server_sessions_by_profile_name(profile_name) + self.__register_available_server_sessions_by_profile_name(profile_name, skip_pubapp_sessions=skip_pubapp_sessions) except x2go_exceptions.X2goSessionRegistryException: pass __register_available_server_sessions_all_profiles = register_available_server_sessions_all_profiles diff --git a/x2go/guardian.py b/x2go/guardian.py index ba5d5b2..a164e7a 100644 --- a/x2go/guardian.py +++ b/x2go/guardian.py @@ -85,6 +85,7 @@ class X2goSessionGuardian(threading.Thread): self.auto_update_listmounts_cache = auto_update_listmounts_cache self.auto_update_sessionregistry = auto_update_sessionregistry self.auto_register_sessions = auto_register_sessions + self.no_auto_register_pubapp_sessions = no_auto_register_pubapp_sessions self.refresh_interval = refresh_interval threading.Thread.__init__(self, target=self.guardian) @@ -117,7 +118,7 @@ class X2goSessionGuardian(threading.Thread): # session auto-registration will automatically trigger an update of the session registry status if self.auto_register_sessions: - self.client_instance.register_available_server_sessions_all_profiles() + self.client_instance.register_available_server_sessions_all_profiles(skip_pubapp_sessions=self.no_auto_register_pubapp_sessions) self.logger('X2Go session guardian thread waking up after %s seconds' % seconds, loglevel=log.loglevel_DEBUG) diff --git a/x2go/registry.py b/x2go/registry.py index 4245cac..de55998 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -376,7 +376,7 @@ class X2goSessionRegistry(object): return True - def register_available_server_sessions(self, profile_name, session_list=None, newly_connected=False, re_register=False): + def register_available_server_sessions(self, profile_name, session_list=None, newly_connected=False, re_register=False, skip_pubapp_sessions=False): """\ Register server-side available X2Go sessions with this L{X2goSessionRegistry} instance for a given profile name. @@ -389,6 +389,8 @@ class X2goSessionRegistry(object): @type newly_connected: C{bool} @param re_register: re-register available sessions, needs to be done after changes to the session profile @type re_register: C{bool} + @param skip_pubapp_sessions: Do not register published applications sessions + @type skip_pubapp_sessions: C{bool} """ if self._last_available_session_registration is not None: @@ -444,7 +446,7 @@ class X2goSessionRegistry(object): except: pass # this if clause catches problems when x2golistsessions commands give weird results - if not self.has_session_of_session_name(session_name) or re_register: + if not (self.has_session_of_session_name(session_name) and not re.match('.*_stRPUBLISHED_.*', session_name)) or re_register: session_uuid = self.register(server, profile_id, profile_name, session_name=session_name, virgin=False, **kwargs 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.2.0.10-76-g564bc7c
by git-admin＠x2go.org 17 Nov '12

17 Nov '12

The branch, master has been updated via 564bc7cc97eccfc1ddca356a2bf52b093b9004a3 (commit) from 14bdff2bb22efd16db1561ee229e8ae004396a21 (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 564bc7cc97eccfc1ddca356a2bf52b093b9004a3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 17 01:09:51 2012 +0100 use non-locking terminate method ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 91d74a7..33c1701 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -438,7 +438,7 @@ class X2goSession(object): # get rid of the faulty session... try: - self.terminate() + self._terminate() except x2go_exceptions.X2goSessionException: 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.2.0.10-75-g14bdff2
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via 14bdff2bb22efd16db1561ee229e8ae004396a21 (commit) via 20679137ce0388c27829cd4948afd33414abe494 (commit) from da000f3c040a8217ebdfc10e6d25065a1b887810 (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 14bdff2bb22efd16db1561ee229e8ae004396a21 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 17 00:24:53 2012 +0100 use non-locking _suspend method for transferring sessions from one client to another commit 20679137ce0388c27829cd4948afd33414abe494 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 17 00:23:25 2012 +0100 try a more intelligent approach for method locking ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 120 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 102 insertions(+), 18 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 678b222..91d74a7 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1703,7 +1703,36 @@ class X2goSession(object): """ self._lock.acquire() + try: + _retval = self._resume(session_name=session_name, session_list=session_list, cmd=cmd, progress_event=progress_event) + except: + raise + finally: + self._lock.release() + return _retval + + def _resume(self, session_name=None, session_list=None, cmd=None, progress_event=None): + """\ + Resume or continue a suspended / running X2Go session on the + remote X2Go server. + + @param session_name: the server-side name of an X2Go session + @type session_name: C{str} + @param session_list: a session list to avoid a server-side session list query + @type session_list: C{dict} + @param cmd: if starting a new session, manually hand over the command to be launched in + the new session + @type cmd: C{str} + @param progress_event: a C{thread.Event} object that notifies a status object like the one in + L{utils.ProgressStatus}. + @type progress_event: C{obj} + + @return: returns C{True} if resuming the session has been successful, C{False} otherwise + @rtype: C{bool} + @raise Exception: any exception that occurs during published application menu retrieval is passed through + + """ # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() _dummy_event = threading.Event() @@ -1738,9 +1767,7 @@ class X2goSession(object): if self.is_running(): try: - self._lock.release() - self.suspend() - self._lock.acquire() + self._suspend() self._progress_status = 10 progress_event.set() @@ -1764,7 +1791,6 @@ class X2goSession(object): self._progress_status = -1 progress_event.set() - self._lock.release() raise if cmd is not None: @@ -1789,7 +1815,6 @@ class X2goSession(object): self._progress_status = -1 progress_event.set() - self._lock.release() return False self._progress_status = 30 @@ -1875,7 +1900,6 @@ class X2goSession(object): progress_event.set() self.has_terminal_session() and self.terminal_session.session_info_unprotect() - self._lock.release() return True else: @@ -1884,7 +1908,6 @@ class X2goSession(object): self._progress_status = -1 progress_event.set() - self._lock.release() return False else: @@ -1893,7 +1916,6 @@ class X2goSession(object): progress_event.set() self._X2goSession__disconnect() - self._lock.release() return False __resume = resume @@ -1946,7 +1968,43 @@ class X2goSession(object): """ self._lock.acquire() + try: + _retval = self._share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=check_desktop_list, progress_event=progress_event) + except: + raise + finally: + self._lock.release() + return _retval + + def _share_desktop(self, desktop=None, user=None, display=None, share_mode=0, check_desktop_list=True, progress_event=None): + """\ + Share an already running X2Go session on the remote X2Go server locally. The shared session may be either + owned by the same user or by a user that grants access to his/her desktop session by the local user. + + @param desktop: desktop ID of a sharable desktop in format <user>@<display> + @type desktop: C{str} + @param user: user name and display number can be given separately, here give the + name of the user who wants to share a session with you. + @type user: C{str} + @param display: user name and display number can be given separately, here give the + number of the display that a user allows you to be shared with. + @type display: C{str} + @param share_mode: desktop sharing mode, 0 is VIEW-ONLY, 1 is FULL-ACCESS. + @type share_mode: C{int} + @param check_desktop_list: check if the given desktop is available on the X2Go server; handle with care as + the server-side C{x2golistdesktops} command might block client I/O. + @type check_desktop_list: C{bool} + @param progress_event: a C{thread.Event} object that notifies a status object like the one in + L{utils.ProgressStatus}. + @type progress_event: C{obj} + + @return: returns C{True} if starting the session has been successful, C{False} otherwise + @rtype: C{bool} + @raise X2goDesktopSharingException: if the given desktop ID is not an available desktop session on the remote server + @raise X2goSessionException: if the available desktop session appears to be dead, in fact + + """ # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() _dummy_event = threading.Event() @@ -2015,7 +2073,6 @@ class X2goSession(object): self._progress_status = 100 progress_event.set() - self._lock.release() return self.running else: self.terminal_session = None @@ -2030,7 +2087,6 @@ class X2goSession(object): self._X2goSession__disconnect() - self._lock.release() return False __share_desktop = share_desktop @@ -2045,6 +2101,24 @@ class X2goSession(object): """ self._lock.acquire() + try: + _retval = self._suspend() + except: + raise + finally: + self._lock.release() + return _retval + + def _suspend(self): + """\ + Suspend this X2Go session. + + @return: returns C{True} if suspending the session has been successful, C{False} otherwise + @rtype: C{bool} + + @raise X2goSessionException: if the session could not be suspended + + """ if self.is_alive(): if self.has_terminal_session(): @@ -2064,7 +2138,6 @@ class X2goSession(object): self.session_cleanup() del self.terminal_session self.terminal_session = None - self._lock.release() return True elif self.has_control_session() and self.session_name: @@ -2076,17 +2149,14 @@ class X2goSession(object): self.faulty = False self.active = False self.session_cleanup() - self._lock.release() return True else: - self._lock.release() raise x2go_exceptions.X2goSessionException('cannot suspend session') else: self._X2goSession__disconnect() - self._lock.release() return False __suspend = suspend @@ -2101,6 +2171,24 @@ class X2goSession(object): """ self._lock.acquire() + try: + _retval = self._terminate() + except: + raise + finally: + self._lock.release() + return _retval + + def _terminate(self): + """\ + Terminate this X2Go session. + + @return: returns C{True} if terminating the session has been successful, C{False} otherwise + @rtype: C{bool} + + @raise X2goSessionException: if the session could not be terminated + + """ if self.is_alive(): if self.has_terminal_session(): @@ -2119,7 +2207,6 @@ class X2goSession(object): self.session_cleanup() del self.terminal_session self.terminal_session = None - self._lock.release() return True elif self.has_control_session() and self.session_name: @@ -2131,16 +2218,13 @@ class X2goSession(object): self.faulty = False self.active = False self.session_cleanup() - self._lock.release() return True else: - self._lock.release() raise x2go_exceptions.X2goSessionException('cannot terminate session') else: self._X2goSession__disconnect() - self._lock.release() return False __terminate = terminate 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.2.0.10-73-gda000f3
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via da000f3c040a8217ebdfc10e6d25065a1b887810 (commit) from bda44ea56d0e45b4b5ced3b25aed52aa70baa5ff (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 da000f3c040a8217ebdfc10e6d25065a1b887810 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 17 00:04:07 2012 +0100 prevent blocking ourselves ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index d6ae740..678b222 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -884,8 +884,6 @@ class X2goSession(object): @rtype: C{str} """ - self._lock.acquire() - self._lock.release() return self.session_name __get_session_name = get_session_name @@ -1740,7 +1738,9 @@ class X2goSession(object): if self.is_running(): try: + self._lock.release() self.suspend() + self._lock.acquire() self._progress_status = 10 progress_event.set() @@ -1764,7 +1764,7 @@ class X2goSession(object): self._progress_status = -1 progress_event.set() - + self._lock.release() raise if cmd is not None: @@ -2179,11 +2179,8 @@ class X2goSession(object): @rtype: C{bool} """ - self._lock.acquire() if self.has_terminal_session(): - self._lock.release() return self.terminal_session.ok() - self._lock.release() return False __session_ok = session_ok 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.2.0.10-72-gbda44ea
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via bda44ea56d0e45b4b5ced3b25aed52aa70baa5ff (commit) from c0080475df80c728c9b5d1a44e60a2105327c73b (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 bda44ea56d0e45b4b5ced3b25aed52aa70baa5ff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 23:53:36 2012 +0100 Implement some internal locking for X2goSession objects. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/session.py | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 60103f2..9ef6745 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low on MS Windows). - Use threading.Lock to prohibit simultaneous calls of get_published_applications() of control sessions. + - Implement some internal locking for X2goSession objects. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/session.py b/x2go/session.py index e841565..d6ae740 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -362,6 +362,7 @@ class X2goSession(object): self.retrieve_server_features() self._progress_status = 0 + self._lock = threading.Lock() def get_client_instance(self): """\ @@ -883,6 +884,8 @@ class X2goSession(object): @rtype: C{str} """ + self._lock.acquire() + self._lock.release() return self.session_name __get_session_name = get_session_name @@ -1701,6 +1704,8 @@ class X2goSession(object): @raise Exception: any exception that occurs during published application menu retrieval is passed through """ + self._lock.acquire() + # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() _dummy_event = threading.Event() @@ -1784,6 +1789,7 @@ class X2goSession(object): self._progress_status = -1 progress_event.set() + self._lock.release() return False self._progress_status = 30 @@ -1869,6 +1875,7 @@ class X2goSession(object): progress_event.set() self.has_terminal_session() and self.terminal_session.session_info_unprotect() + self._lock.release() return True else: @@ -1877,15 +1884,16 @@ class X2goSession(object): self._progress_status = -1 progress_event.set() + self._lock.release() return False - return self.running else: self._progress_status = -1 progress_event.set() self._X2goSession__disconnect() + self._lock.release() return False __resume = resume @@ -1937,6 +1945,8 @@ class X2goSession(object): @raise X2goSessionException: if the available desktop session appears to be dead, in fact """ + self._lock.acquire() + # initialize a dummy event to avoid many if clauses further down in the code self.reset_progress_status() _dummy_event = threading.Event() @@ -2005,6 +2015,7 @@ class X2goSession(object): self._progress_status = 100 progress_event.set() + self._lock.release() return self.running else: self.terminal_session = None @@ -2019,6 +2030,7 @@ class X2goSession(object): self._X2goSession__disconnect() + self._lock.release() return False __share_desktop = share_desktop @@ -2032,6 +2044,7 @@ class X2goSession(object): @raise X2goSessionException: if the session could not be suspended """ + self._lock.acquire() if self.is_alive(): if self.has_terminal_session(): @@ -2051,6 +2064,7 @@ class X2goSession(object): self.session_cleanup() del self.terminal_session self.terminal_session = None + self._lock.release() return True elif self.has_control_session() and self.session_name: @@ -2062,14 +2076,17 @@ class X2goSession(object): self.faulty = False self.active = False self.session_cleanup() + self._lock.release() return True else: + self._lock.release() raise x2go_exceptions.X2goSessionException('cannot suspend session') else: self._X2goSession__disconnect() + self._lock.release() return False __suspend = suspend @@ -2083,6 +2100,7 @@ class X2goSession(object): @raise X2goSessionException: if the session could not be terminated """ + self._lock.acquire() if self.is_alive(): if self.has_terminal_session(): @@ -2101,6 +2119,7 @@ class X2goSession(object): self.session_cleanup() del self.terminal_session self.terminal_session = None + self._lock.release() return True elif self.has_control_session() and self.session_name: @@ -2112,13 +2131,16 @@ class X2goSession(object): self.faulty = False self.active = False self.session_cleanup() + self._lock.release() return True else: + self._lock.release() raise x2go_exceptions.X2goSessionException('cannot terminate session') else: self._X2goSession__disconnect() + self._lock.release() return False __terminate = terminate @@ -2157,8 +2179,11 @@ class X2goSession(object): @rtype: C{bool} """ + self._lock.acquire() if self.has_terminal_session(): + self._lock.release() return self.terminal_session.ok() + self._lock.release() return False __session_ok = session_ok 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.2.0.4-95-ga5593b2
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via a5593b2e7efc3b6e6e9c994e2cc16f4f141ff1a7 (commit) from 7eecfc7640ffdf1f30c3734af494dd15f18f4450 (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 a5593b2e7efc3b6e6e9c994e2cc16f4f141ff1a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 22:03:32 2012 +0100 moving line of code ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index bbb7e12..c4c4982 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -556,9 +556,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): ) pubapp_session_started = pubapp_session.start() - self._temp_launching_pubapp_locks[profile_name].release() if profile_name in self._temp_launching_pubapp_profiles: self._temp_launching_pubapp_profiles.remove(profile_name) + self._temp_launching_pubapp_locks[profile_name].release() return pubapp_session_started | pubapp_session_resumed 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.2.0.4-94-g7eecfc7
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via 7eecfc7640ffdf1f30c3734af494dd15f18f4450 (commit) from ea1bcbc809d3dfaaed57a745190f6ac4bdc3aac3 (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 7eecfc7640ffdf1f30c3734af494dd15f18f4450 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 21:49:35 2012 +0100 var name mismatch ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index ffb0bf5..bbb7e12 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -485,7 +485,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if profile_name is None and session_uuid: profile_name = self._X2goClient__get_session_profile_name(session_uuid) - if not self._temp_launching_pubapp_profiles.has_key(profile_name): + if not self._temp_launching_pubapp_locks.has_key(profile_name): self._temp_launching_pubapp_locks[profile_name] = threading.Lock() if not self._X2goClient__client_connected_sessions_of_profile_name(profile_name): 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.2.0.4-93-gea1bcbc
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via ea1bcbc809d3dfaaed57a745190f6ac4bdc3aac3 (commit) from 95d6628ecfe0ecadec0ead74ca3f24d14286a5a3 (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 ea1bcbc809d3dfaaed57a745190f6ac4bdc3aac3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 21:44:51 2012 +0100 more delicate handling of locking and registering pubapp sessions ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 6302b8f..ffb0bf5 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -322,7 +322,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._eventid_shared_folders_map = {} self._eventid_unshared_folders_map = {} self._eventid_pubapp_execmap = {} - self._temp_launching_pubapp_profiles = {} + self._temp_launching_pubapp_profiles = [] + self._temp_launching_pubapp_locks = {} self._temp_disabled_profile_names = [] self._temp_disabled_session_names = {} @@ -485,7 +486,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): profile_name = self._X2goClient__get_session_profile_name(session_uuid) if not self._temp_launching_pubapp_profiles.has_key(profile_name): - self._temp_launching_pubapp_profiles[profile_name] = threading.Lock() + self._temp_launching_pubapp_locks[profile_name] = threading.Lock() if not self._X2goClient__client_connected_sessions_of_profile_name(profile_name): return None @@ -499,7 +500,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if len(self.client_pubapp_sessions_of_profile_name(profile_name=profile_name)): return False - self._temp_launching_pubapp_profiles[profile_name].acquire() + self._temp_launching_pubapp_locks[profile_name].acquire() + if profile_name not in self._temp_launching_pubapp_profiles: + self._temp_launching_pubapp_profiles.append(profile_name) pubapp_session_started = False pubapp_session_resumed = False @@ -553,7 +556,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): ) pubapp_session_started = pubapp_session.start() - self._temp_launching_pubapp_profiles[profile_name].release() + self._temp_launching_pubapp_locks[profile_name].release() + if profile_name in self._temp_launching_pubapp_profiles: + self._temp_launching_pubapp_profiles.remove(profile_name) return pubapp_session_started | pubapp_session_resumed 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.2.0.4-92-g95d6628
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via 95d6628ecfe0ecadec0ead74ca3f24d14286a5a3 (commit) from 2a49b0d8f2aa4cf4245143042803c656d80aff50 (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 95d6628ecfe0ecadec0ead74ca3f24d14286a5a3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 21:29:16 2012 +0100 fix for commit ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9 ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index d8c1e98..6302b8f 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -322,7 +322,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._eventid_shared_folders_map = {} self._eventid_unshared_folders_map = {} self._eventid_pubapp_execmap = {} - self._temp_launching_pubapp_profiles = [] + self._temp_launching_pubapp_profiles = {} self._temp_disabled_profile_names = [] self._temp_disabled_session_names = {} @@ -553,7 +553,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): ) pubapp_session_started = pubapp_session.start() - self._temp_launching_pubapp_profiles.release() + self._temp_launching_pubapp_profiles[profile_name].release() return pubapp_session_started | pubapp_session_resumed 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

← Newer
1
...
7
8
9
10
11
12
13
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2012