summary refs log tree commit diff
path: root/synapse/replication/tcp/resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
committerErik Johnston <erik@matrix.org>2017-10-24 09:16:20 +0100
commit39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch)
tree8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/replication/tcp/resource.py
parentCorrectly wire in update group profile over federation (diff)
parentMerge pull request #2568 from matrix-org/rav/pep8 (diff)
downloadsynapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
Diffstat (limited to 'synapse/replication/tcp/resource.py')
-rw-r--r--synapse/replication/tcp/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py
index 6c1beca4e3..1d03e79b85 100644
--- a/synapse/replication/tcp/resource.py
+++ b/synapse/replication/tcp/resource.py
@@ -162,7 +162,7 @@ class ReplicationStreamer(object):
                         )
                         try:
                             updates, current_token = yield stream.get_updates()
-                        except:
+                        except Exception:
                             logger.info("Failed to handle stream %s", stream.NAME)
                             raise