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_base.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_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index 223aace0d9..0e22183280 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -102,7 +102,7 @@ class FederationBase(object): pass if not res: - logger.warn( + logger.warning( "Failed to find copy of %s with valid signature", pdu.event_id ) @@ -173,7 +173,7 @@ class FederationBase(object): return redacted_event if self.spam_checker.check_event_for_spam(pdu): - logger.warn( + logger.warning( "Event contains spam, redacting %s: %s", pdu.event_id, pdu.get_pdu_json(), @@ -185,7 +185,7 @@ class FederationBase(object): def errback(failure, pdu): failure.trap(SynapseError) with PreserveLoggingContext(ctx): - logger.warn( + logger.warning( "Signature check failed for %s: %s", pdu.event_id, failure.getErrorMessage(), |