[X2Go-Commits] [x2gobroker] 06/07: Fix broker crashes when no session status is available for certain session profiles.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit db86895adeabb75aca02c9d084101c23cbc18a90
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 24 14:40:27 2014 +0100

    Fix broker crashes when no session status is available for certain session profiles.
---
 debian/changelog                  |    2 ++
 x2gobroker/brokers/base_broker.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fd5259b..ee2b51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -114,6 +114,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Load X2GOBROKER_DAEMON_USER's known_hosts key file before doing
       remote agent calls.
     - Fully rewrite agent.py.
+    - Fix broker crashes when no session status is available for certain
+      session profiles.
   * debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Fix SYNOPSIS texts.
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 6a5e879..8da869c 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -935,7 +935,7 @@ class X2GoBroker(object):
                             logger_broker.debug('base_broker.X2GoBroker.list_profiles(): found running sessions on host(s): {hosts}'.format(hosts=', '.join(suspended_sessions)))
                         if x2gobroker.utils.matching_hostnames(profile['host'], running_sessions): profile['status'] = u'R'
                         if x2gobroker.utils.matching_hostnames(profile['host'], suspended_sessions): profile['status'] = u'S'
-                        if profile['status']:
+                        if profile.has_key('status') and profile['status']:
                             logger_broker.debug('base_broker.X2GoBroker.list_profiles(): marking session profile {name} as {status}'.format(name=profile['name'], status=profile['status']))
 
                     except x2gobroker.x2gobroker_exceptions.X2GoBrokerAgentException:

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git