From d0c4cc55c0941be840c3f375b10254082fb4be66 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 5 Oct 2011 16:48:25 +0200 Subject: [PATCH] core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) --- src/core/sat_main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core/sat_main.py b/src/core/sat_main.py index 0d30eb43..66aeb8c7 100644 --- a/src/core/sat_main.py +++ b/src/core/sat_main.py @@ -507,10 +507,16 @@ class SAT(service.Service): debug (_('Identity added: (%(category)s,%(type)s) ==> %(entity)s [%(profile)s]') % { 'category':category, 'type':type, 'entity':entity, 'profile':profile}) self.memory.addServerIdentity(category, type, entity, profile) + + def _errback(result, entity, profile): + warning(_("Can't get information on identity [%(entity)s] for profile [%(profile)s]") % {'entity':entity, 'profile': profile}) defer_list = [] for item in disco_result._items: - defer_list.append(disco_client.requestInfo(item.entity).addCallback(_check_entity_cb, item.entity, profile)) + if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp + continue + args = [item.entity, profile] + defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args)) defer.DeferredList(defer_list).chainDeferred(initialized)