diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-20 14:15:56 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-20 14:15:56 +0000 |
| commit | 4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9 (patch) | |
| tree | 43ac96a5b91bbc498228f44798cdc260de1f47c0 /synapse/push/httppusher.py | |
| parent | Apply the pusher http hack in the right place (#4692) (diff) | |
| parent | Logging improvements for the pusher (#4691) (diff) | |
| download | synapse-4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9.tar.xz | |
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/push/httppusher.py')
| -rw-r--r-- | synapse/push/httppusher.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 080a7dd9ad..1c045383eb 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -337,10 +337,10 @@ class HttpPusher(object): defer.returnValue([]) try: resp = yield self.http_client.post_json_get_json(self.url, notification_dict) - except Exception: - logger.warn( - "Failed to push event %s to %s", - event.event_id, self.name, exc_info=True, + except Exception as e: + logger.warning( + "Failed to push event %s to %s: %s %s", + event.event_id, self.name, type(e), e, ) defer.returnValue(False) rejected = [] @@ -371,10 +371,10 @@ class HttpPusher(object): } try: resp = yield self.http_client.post_json_get_json(self.url, d) - except Exception: - logger.warn( - "Failed to send badge count to %s", - self.name, exc_info=True, + except Exception as e: + logger.warning( + "Failed to send badge count to %s: %s %s", + self.name, type(e), e, ) defer.returnValue(False) rejected = [] |