erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (memory/disco): recover getItems on bridge's discoItems method if an item is empty

Browse source
This commit is contained in:
Goffi 2016-12-18 16:28:44 +01:00
commit 1b7290aa70
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/memory/disco.py
View file

@ -350,4 +350,11 @@ class Discovery(object):
profile = self.host.memory.getProfileName(profile_key)
entity = jid.JID(entity_jid_s)
disco_items = yield self.getItems(entity, profile=profile)
defer.returnValue([(item.entity.full(), item.nodeIdentifier or '', item.name or '') for item in disco_items])
try:
ret = [(item.entity.full(), item.nodeIdentifier or '', item.name or '') for item in disco_items]
except AttributeError:
log.error(u"error while getting items from {entity}, it may result from invalid item(s)".format(entity=entity.full()))
# second try by ignoring empty items
ret = [(item.entity.full(), item.nodeIdentifier or '', item.name or '') for item in disco_items if item.entity]
defer.returnValue(ret)