summary refs log tree commit diff
path: root/synapse/push/httppusher.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/push/httppusher.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/push/httppusher.py')
-rw-r--r--synapse/push/httppusher.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
index 62c41cd9db..74c0bc462c 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -131,7 +131,7 @@ class HttpPusher(object):
                         starting_max_ordering = self.max_stream_ordering
                         try:
                             yield self._unsafe_process()
-                        except:
+                        except Exception:
                             logger.exception("Exception processing notifs")
                         if self.max_stream_ordering == starting_max_ordering:
                             break
@@ -314,7 +314,7 @@ class HttpPusher(object):
             defer.returnValue([])
         try:
             resp = yield self.http_client.post_json_get_json(self.url, notification_dict)
-        except:
+        except Exception:
             logger.warn("Failed to push %s ", self.url)
             defer.returnValue(False)
         rejected = []
@@ -345,7 +345,7 @@ class HttpPusher(object):
         }
         try:
             resp = yield self.http_client.post_json_get_json(self.url, d)
-        except:
+        except Exception:
             logger.exception("Failed to push %s ", self.url)
             defer.returnValue(False)
         rejected = []