[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.4.0.6-7-g3847b19

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:21:44 CET 2014


The branch, brokerclient has been updated
       via  3847b19e083afc177aa06ac45f5421899d0032c6 (commit)
      from  963eaed8dba7cb7444bd18d847c630bfb53c39fe (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 |    3 +++
 x2go/cache.py    |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f29b9bf..3e6191f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.4.0.7):
     - Drop duplicate method in terminal backend: is_desktop_session().
     - Ignore non-registered session UUIDs in X2GoClient.clean_sessions() method.
+    - Make _update_mounts in session registry cache more failsafe, this probably
+      fixes an accumulation of server disconnects observed in recent version of
+      Python X2Go.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
 
diff --git a/x2go/cache.py b/x2go/cache.py
index 5998bd3..b3b6968 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -152,7 +152,8 @@ class X2GoListSessionsCache(object):
             self.x2go_listsessions_cache[profile_name]['mounts'] = {}
             if self.x2go_listsessions_cache[profile_name]['sessions']:
                 for session_name in self.x2go_listsessions_cache[profile_name]['sessions']:
-                    if self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name).is_running():
+                    session = self.client_instance.get_session_of_session_name(session_name, return_object=True, match_profile_name=profile_name)
+                    if session is not None and session.is_running():
                         if control_session is not None and not control_session.has_session_died():
                             self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name))
         except (x2go_exceptions.X2GoControlSessionException, AttributeError), e:


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list