diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-10-27 12:39:45 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-10-27 12:39:45 +0100 |
| commit | d55f680f60ba7899635ac02c14ad9d18c7de63f1 (patch) | |
| tree | 9641c416dcf6ce9ce5100c1c95551585572f0da1 | |
| parent | fix trailing whitespace (diff) | |
| parent | PEP8 (diff) | |
| download | synapse-d55f680f60ba7899635ac02c14ad9d18c7de63f1.tar.xz | |
Merge branch 'matrix-org-hotfixes' into rav/frontend_proxy_auth_header_matrix_hotfixes
| -rw-r--r-- | synapse/federation/transaction_queue.py | 4 | ||||
| -rw-r--r-- | synapse/replication/slave/storage/client_ips.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index ec8ca08854..17f27e32cc 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -188,7 +188,7 @@ class TransactionQueue(object): prev_id for prev_id, _ in event.prev_events ], ) - except: + except Exception: logger.exception("Failed to calculate hosts in room") continue @@ -249,7 +249,7 @@ class TransactionQueue(object): Args: states (list(UserPresenceState)) """ - return + return # First we queue up the new presence by user ID, so multiple presence # updates in quick successtion are correctly handled diff --git a/synapse/replication/slave/storage/client_ips.py b/synapse/replication/slave/storage/client_ips.py index 4796eb166b..fedf7a3188 100644 --- a/synapse/replication/slave/storage/client_ips.py +++ b/synapse/replication/slave/storage/client_ips.py @@ -42,7 +42,7 @@ class SlavedClientIpStore(BaseSlavedStore): if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY: return - self.client_ip_last_seen.prefill(key, now) + self.client_ip_last_seen.prefill(key, now) self.hs.get_tcp_replication().send_user_ip( user_id, access_token, ip, user_agent, device_id, now |