core: bug fix for serverDiscoItems (bad use of addCallbacks)
This commit is contained in:
parent
bbadfda25b
commit
d98b470117
1 changed files with 2 additions and 2 deletions
|
|
@ -708,7 +708,7 @@ class SAT(service.Service):
|
|||
|
||||
def errback(failure, method, jid_, profile):
|
||||
# the target server is not reachable
|
||||
logging.error("disco.%s on %s failed! [%s]" % (method.func_name, jid_, profile))
|
||||
logging.error("disco.%s on %s failed! [%s]" % (method.func_name, jid_.userhost(), profile))
|
||||
logging.error("reason: %s" % failure.getErrorMessage())
|
||||
if method == disco.requestInfo:
|
||||
features = self.memory.server_features.setdefault(profile, {})
|
||||
|
|
@ -727,7 +727,7 @@ class SAT(service.Service):
|
|||
return d2.addCallback(haveItemsFeature)
|
||||
|
||||
d = disco.requestInfo(jid_).addCallback(self.serverDisco, jid_, profile)
|
||||
d.addCallbacks(callback, errback, [], [disco.requestInfo, jid_, profile])
|
||||
d.addCallbacks(callback, errback, [], errbackArgs=[disco.requestInfo, jid_, profile])
|
||||
return d
|
||||
|
||||
## callbacks ##
|
||||
|
|
|
|||
Loading…
Reference in a new issue