Mercurial > libervia-pubsub

comparison idavoll/idavoll.py @ 102:f4d725a94202

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug in how errors are handled in disco info request.
author Ralph Meijer <ralphm@ik.nu>
date Sun, 02 Jan 2005 20:29:15 +0000
parents b75fcc554358
children 8d8946e67fcb
comparison
equal deleted inserted replaced
101:b75fcc554358 102:f4d725a94202
51 for c in self.parent: 51 for c in self.parent:
52 if components.implements(c, component.IService): 52 if components.implements(c, component.IService):
53 if hasattr(c, "get_disco_info"): 53 if hasattr(c, "get_disco_info"):
54 dl.append(c.get_disco_info(node)) 54 dl.append(c.get_disco_info(node))
55 d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1) 55 d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1)
56 d.addErrback(self._error, iq)
56 d.addCallback(self._disco_info_results, iq, node) 57 d.addCallback(self._disco_info_results, iq, node)
57 d.addErrback(self._error, iq)
58 d.addCallback(self.send) 58 d.addCallback(self.send)
59 59
60 iq.handled = True 60 iq.handled = True
61 61
62 def _disco_info_results(self, results, iq, node): 62 def _disco_info_results(self, results, iq, node):
90 for c in self.parent: 90 for c in self.parent:
91 if components.implements(c, component.IService): 91 if components.implements(c, component.IService):
92 if hasattr(c, "get_disco_items"): 92 if hasattr(c, "get_disco_items"):
93 dl.append(c.get_disco_items(node)) 93 dl.append(c.get_disco_items(node))
94 d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1) 94 d = defer.DeferredList(dl, fireOnOneErrback=1, consumeErrors=1)
95 d.addErrback(self._error, iq)
95 d.addCallback(self._disco_items_result, iq, node) 96 d.addCallback(self._disco_items_result, iq, node)
96 d.addErrback(self._error, iq)
97 d.addCallback(self.send) 97 d.addCallback(self.send)
98 98
99 iq.handled = True 99 iq.handled = True
100 100
101 def _disco_items_result(self, results, iq, node): 101 def _disco_items_result(self, results, iq, node):