diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-01-22 19:11:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 19:11:18 +0100 |
| commit | ab9f844aaf3662a64dbc4c56077e9fa37bc7d5d0 (patch) | |
| tree | df5417cbd46f5c9a386d4d762f83b06d58afda17 /synapse/federation/transaction_queue.py | |
| parent | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid (diff) | |
| download | synapse-ab9f844aaf3662a64dbc4c56077e9fa37bc7d5d0.tar.xz | |
Add federation_domain_whitelist option (#2820)
Add federation_domain_whitelist gives a way to restrict which domains your HS is allowed to federate with. useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network
Diffstat (limited to 'synapse/federation/transaction_queue.py')
| -rw-r--r-- | synapse/federation/transaction_queue.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 9d39f46583..a141ec9953 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -19,7 +19,7 @@ from twisted.internet import defer from .persistence import TransactionActions from .units import Transaction, Edu -from synapse.api.errors import HttpResponseException +from synapse.api.errors import HttpResponseException, FederationDeniedError from synapse.util import logcontext, PreserveLoggingContext from synapse.util.async import run_on_reactor from synapse.util.retryutils import NotRetryingDestination, get_retry_limiter @@ -490,6 +490,8 @@ class TransactionQueue(object): (e.retry_last_ts + e.retry_interval) / 1000.0 ), ) + except FederationDeniedError as e: + logger.info(e) except Exception as e: logger.warn( "TX [%s] Failed to send transaction: %s", |