[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.0.4-93-gea1bcbc

X2Go dev team git-admin at x2go.org
Fri Nov 16 21:46:18 CET 2012


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 at 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)).




More information about the x2go-commits mailing list