plugin XEP-0060: set a 30s timeout on items get

This commit is contained in:
Goffi 2019-01-11 19:49:01 +01:00
commit 173e192526

View file

@ -26,7 +26,7 @@ from sat.core import exceptions
from sat.tools import sat_defer
from twisted.words.protocols.jabber import jid, error
from twisted.internet import defer
from twisted.internet import reactor, defer
from wokkel import disco
from wokkel import data_form
from zope.interface import implements
@ -58,7 +58,7 @@ UNSPECIFIED = "unspecified error"
Extra = namedtuple("Extra", ("rsm_request", "extra"))
# rsm_request is the rsm.RSMRequest build with rsm_ prefixed keys, or None
# extra is a potentially empty dict
TIMEOUT = 30
class XEP_0060(object):
OPT_ACCESS_MODEL = "pubsub#access_model"
@ -556,6 +556,7 @@ class XEP_0060(object):
)
# we have no MAM data here, so we add None
d.addCallback(lambda data: data + (None,))
d.addTimeout(TIMEOUT, reactor)
else:
# if mam is requested, we have to do a totally different query
if self._mam is None: