diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
| commit | cd581338cf2618d8480ce7ba6a2ffd4a5270b552 (patch) | |
| tree | 533c0f5efcde3f06ea6e069c9d4ee8fb4f6ee231 /synapse/federation/federation_client.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
| download | synapse-cd581338cf2618d8480ce7ba6a2ffd4a5270b552.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index f5c1632916..595706d01a 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -522,12 +522,12 @@ class FederationClient(FederationBase): res = yield callback(destination) return res except InvalidResponseError as e: - logger.warn("Failed to %s via %s: %s", description, destination, e) + logger.warning("Failed to %s via %s: %s", description, destination, e) except HttpResponseException as e: if not 500 <= e.code < 600: raise e.to_synapse_error() else: - logger.warn( + logger.warning( "Failed to %s via %s: %i %s", description, destination, @@ -535,7 +535,9 @@ class FederationClient(FederationBase): e.args[0], ) except Exception: - logger.warn("Failed to %s via %s", description, destination, exc_info=1) + logger.warning( + "Failed to %s via %s", description, destination, exc_info=1 + ) raise SynapseError(502, "Failed to %s via any server" % (description,)) |