This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 62c04e6ace0f23f2ffcdca2a952958625223f364 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 10 15:27:27 2014 +0100 Handle selectsessions calls with a non-existent profile ID gracefully. --- debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1a88420..b9eb459 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low top level to the JSON output tree. - Store cookies in /var/lib/x2gobroker (path is more appropriate than previously suggested path /var/log/x2gobroker). + - Handle selectsessions calls with a non-existent profile ID gracefully. * 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 f8445a3..c3383f5 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -37,6 +37,7 @@ import os.path import x2gobroker.config import x2gobroker.defaults import x2gobroker.agent +import x2gobroker.x2gobroker_exceptions from x2gobroker.loggers import logger_broker, logger_error @@ -956,7 +957,10 @@ class X2GoBroker(object): @type username: C{unicode} """ - profile = self.get_profile(profile_id) + try: + profile = self.get_profile(profile_id) + except x2gobroker.x2gobroker_exceptions.X2GoBrokerProfileException: + return {} # if we have more than one server, pick one server randomly for X2Go Broker Agent queries server_list = profile[u'host'] -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git