# HG changeset patch # User souliane # Date 1448546364 -3600 # Node ID bf4098a6cbb7ad32a895b974b0d7d4f2ced458a1 # Parent 3c2705199108607264bd710b66a8f5bc06742c0e log the owner JID when roster request failed diff -r 3c2705199108 -r bf4098a6cbb7 sat_pubsub/backend.py --- a/sat_pubsub/backend.py Tue Dec 01 23:32:32 2015 +0100 +++ b/sat_pubsub/backend.py Thu Nov 26 14:59:24 2015 +0100 @@ -591,8 +591,8 @@ d.addCallback(lambda groups: (roster, groups)) return d - def _rosterEb(self, failure): - log.msg("Error while getting roster: {}".format(failure.value)) + def _rosterEb(self, failure, owner_jid): + log.msg("Error while getting roster of {}: {}".format(unicode(owner_jid), failure.value)) return {} def _tuple2ItemData(self, items_data): @@ -661,8 +661,13 @@ access_model = node.getAccessModel() d = node.getNodeOwner() - d.addCallback(self.privilege.getRoster) - d.addErrback(self._rosterEb) + + def gotOwner(owner_jid): + d_roster = self.privilege.getRoster(owner_jid) + d_roster.addErrback(self._rosterEb, owner_jid) + return d_roster + + d.addCallback(gotOwner) if access_model == const.VAL_AMODEL_OPEN or affiliation == 'owner': d.addCallback(lambda roster: (True, roster)) @@ -1102,7 +1107,7 @@ def _got_owner(owner_jid): #return a tuple with owner_jid and roster def rosterEb(failure): - log.msg("Error while getting roster: {}".format(failure.value)) + log.msg("Error while getting roster of {}: {}".format(unicode(owner_jid), failure.value)) return (owner_jid, {}) d = self.backend.privilege.getRoster(owner_jid)