mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 18:30:24 +00:00
add errbacks to enqueue_pdu deferreds; change logging for failed federation sends to warn rather than exception
This commit is contained in:
parent
2b1acb7671
commit
faf12b64f8
2 changed files with 12 additions and 8 deletions
|
@ -334,7 +334,7 @@ class ReplicationLayer(object):
|
|||
defer.returnValue(response)
|
||||
return
|
||||
|
||||
logger.debug("[%s] Transacition is new", transaction.transaction_id)
|
||||
logger.debug("[%s] Transaction is new", transaction.transaction_id)
|
||||
|
||||
with PreserveLoggingContext():
|
||||
dl = []
|
||||
|
@ -724,15 +724,19 @@ class _TransactionQueue(object):
|
|||
deferreds = []
|
||||
|
||||
for destination in destinations:
|
||||
# XXX: why don't we specify an errback for this deferred
|
||||
# like we do for EDUs? --matthew
|
||||
deferred = defer.Deferred()
|
||||
self.pending_pdus_by_dest.setdefault(destination, []).append(
|
||||
(pdu, deferred, order)
|
||||
)
|
||||
|
||||
def eb(failure):
|
||||
if not deferred.called:
|
||||
deferred.errback(failure)
|
||||
else:
|
||||
logger.warn("Failed to send pdu", failure)
|
||||
|
||||
with PreserveLoggingContext():
|
||||
self._attempt_new_transaction(destination)
|
||||
self._attempt_new_transaction(destination).addErrback(eb)
|
||||
|
||||
deferreds.append(deferred)
|
||||
|
||||
|
@ -754,7 +758,7 @@ class _TransactionQueue(object):
|
|||
if not deferred.called:
|
||||
deferred.errback(failure)
|
||||
else:
|
||||
logger.exception("Failed to send edu", failure)
|
||||
logger.warn("Failed to send edu", failure)
|
||||
|
||||
with PreserveLoggingContext():
|
||||
self._attempt_new_transaction(destination).addErrback(eb)
|
||||
|
@ -901,7 +905,7 @@ class _TransactionQueue(object):
|
|||
except Exception as e:
|
||||
# We capture this here as there as nothing actually listens
|
||||
# for this finishing functions deferred.
|
||||
logger.exception("TX [%s] Problem in _attempt_transaction: %s",
|
||||
logger.warn("TX [%s] Problem in _attempt_transaction: %s",
|
||||
destination, e)
|
||||
|
||||
self.start_retrying(destination, retry_interval)
|
||||
|
|
|
@ -134,7 +134,7 @@ class MatrixFederationHttpClient(object):
|
|||
e)
|
||||
raise SynapseError(400, "Domain specified not found.")
|
||||
|
||||
logger.exception("Sending request failed to %s: %s %s : %s",
|
||||
logger.warn("Sending request failed to %s: %s %s : %s",
|
||||
destination, method, url_bytes, e)
|
||||
_print_ex(e)
|
||||
|
||||
|
@ -289,7 +289,7 @@ def _print_ex(e):
|
|||
for ex in e.reasons:
|
||||
_print_ex(ex)
|
||||
else:
|
||||
logger.exception(e)
|
||||
logger.warn(e)
|
||||
|
||||
|
||||
class _JsonProducer(object):
|
||||
|
|
Loading…
Reference in a new issue