mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 16:40:20 +00:00
Better handle 404 response for federation /send/
This commit is contained in:
parent
ab55794b6f
commit
ae7a132f38
2 changed files with 14 additions and 2 deletions
|
@ -319,6 +319,7 @@ class TransactionQueue(object):
|
||||||
destination,
|
destination,
|
||||||
self.clock,
|
self.clock,
|
||||||
self.store,
|
self.store,
|
||||||
|
backoff_on_404=True, # If we get a 404 the other side has gone
|
||||||
)
|
)
|
||||||
|
|
||||||
device_message_edus, device_stream_id, dev_list_id = (
|
device_message_edus, device_stream_id, dev_list_id = (
|
||||||
|
|
|
@ -88,7 +88,7 @@ class RetryDestinationLimiter(object):
|
||||||
def __init__(self, destination, clock, store, retry_interval,
|
def __init__(self, destination, clock, store, retry_interval,
|
||||||
min_retry_interval=10 * 60 * 1000,
|
min_retry_interval=10 * 60 * 1000,
|
||||||
max_retry_interval=24 * 60 * 60 * 1000,
|
max_retry_interval=24 * 60 * 60 * 1000,
|
||||||
multiplier_retry_interval=5,):
|
multiplier_retry_interval=5, backoff_on_404=False):
|
||||||
"""Marks the destination as "down" if an exception is thrown in the
|
"""Marks the destination as "down" if an exception is thrown in the
|
||||||
context, except for CodeMessageException with code < 500.
|
context, except for CodeMessageException with code < 500.
|
||||||
|
|
||||||
|
@ -107,6 +107,7 @@ class RetryDestinationLimiter(object):
|
||||||
a failed request, in milliseconds.
|
a failed request, in milliseconds.
|
||||||
multiplier_retry_interval (int): The multiplier to use to increase
|
multiplier_retry_interval (int): The multiplier to use to increase
|
||||||
the retry interval after a failed request.
|
the retry interval after a failed request.
|
||||||
|
backoff_on_404 (bool): Back off if we get a 404
|
||||||
"""
|
"""
|
||||||
self.clock = clock
|
self.clock = clock
|
||||||
self.store = store
|
self.store = store
|
||||||
|
@ -116,6 +117,7 @@ class RetryDestinationLimiter(object):
|
||||||
self.min_retry_interval = min_retry_interval
|
self.min_retry_interval = min_retry_interval
|
||||||
self.max_retry_interval = max_retry_interval
|
self.max_retry_interval = max_retry_interval
|
||||||
self.multiplier_retry_interval = multiplier_retry_interval
|
self.multiplier_retry_interval = multiplier_retry_interval
|
||||||
|
self.backoff_on_404 = backoff_on_404
|
||||||
|
|
||||||
def __enter__(self):
|
def __enter__(self):
|
||||||
pass
|
pass
|
||||||
|
@ -123,7 +125,16 @@ class RetryDestinationLimiter(object):
|
||||||
def __exit__(self, exc_type, exc_val, exc_tb):
|
def __exit__(self, exc_type, exc_val, exc_tb):
|
||||||
valid_err_code = False
|
valid_err_code = False
|
||||||
if exc_type is not None and issubclass(exc_type, CodeMessageException):
|
if exc_type is not None and issubclass(exc_type, CodeMessageException):
|
||||||
valid_err_code = exc_val.code != 429 and 0 <= exc_val.code < 500
|
if exc_val.code < 400:
|
||||||
|
valid_err_code = True
|
||||||
|
elif exc_val.code == 404 and self.backoff_on_404:
|
||||||
|
valid_err_code = False
|
||||||
|
elif exc_val.code == 429:
|
||||||
|
valid_err_code = False
|
||||||
|
elif exc_val.code < 500:
|
||||||
|
valid_err_code = True
|
||||||
|
else:
|
||||||
|
valid_err_code = False
|
||||||
|
|
||||||
if exc_type is None or valid_err_code:
|
if exc_type is None or valid_err_code:
|
||||||
# We connected successfully.
|
# We connected successfully.
|
||||||
|
|
Loading…
Reference in a new issue