# HG changeset patch # User Goffi # Date 1627571436 -7200 # Node ID 2c7a52a62be31e09092862c296669caeed990b2c # Parent 2715da5b2aa71481bc0827041ae51343313c9d99 plugin XEP-0060: events callbacks can now be sync or async diff -r 2715da5b2aa7 -r 2c7a52a62be3 sat/plugins/plugin_xep_0060.py --- a/sat/plugins/plugin_xep_0060.py Thu Jul 29 15:54:54 2021 +0200 +++ b/sat/plugins/plugin_xep_0060.py Thu Jul 29 17:10:36 2021 +0200 @@ -37,6 +37,7 @@ from sat.core.log import getLogger from sat.core.core_types import SatXMPPEntity from sat.core import exceptions +from sat.tools import utils from sat.tools import sat_defer from sat.tools import xml_tools from sat.tools.common import data_format @@ -1507,7 +1508,10 @@ def itemsReceived(self, event): log.debug("Pubsub items received") for callback in self._getNodeCallbacks(event.nodeIdentifier, C.PS_ITEMS): - callback(self.parent, event) + d = utils.asDeferred(callback, self.parent, event) + d.addErrback(lambda f: log.error( + f"Error while running items event callback {callback}: {f}" + )) client = self.parent if (event.sender, event.nodeIdentifier) in client.pubsub_watching: raw_items = [i.toXml() for i in event.items] @@ -1522,7 +1526,10 @@ def deleteReceived(self, event): log.debug(("Publish node deleted")) for callback in self._getNodeCallbacks(event.nodeIdentifier, C.PS_DELETE): - callback(self.parent, event) + d = utils.asDeferred(callback, self.parent, event) + d.addErrback(lambda f: log.error( + f"Error while running delete event callback {callback}: {f}" + )) client = self.parent if (event.sender, event.nodeIdentifier) in client.pubsub_watching: self.host.bridge.psEventRaw(