diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
| commit | 5aa024e50132924d50229c633249a17eff9180f1 (patch) | |
| tree | 5b0ee152c49f6a772bcb4e133fd4649aa612bda3 /synapse/util | |
| parent | Add destination retry to slave store (diff) | |
| parent | Merge pull request #966 from matrix-org/markjh/fix_push (diff) | |
| download | synapse-5aa024e50132924d50229c633249a17eff9180f1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/metrics.py | 2 | ||||
| -rw-r--r-- | synapse/util/presentable_names.py | 5 | ||||
| -rw-r--r-- | synapse/util/retryutils.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py index e1f374807e..0b944d3e63 100644 --- a/synapse/util/metrics.py +++ b/synapse/util/metrics.py @@ -84,7 +84,7 @@ class Measure(object): if context != self.start_context: logger.warn( - "Context have unexpectedly changed from '%s' to '%s'. (%r)", + "Context has unexpectedly changed from '%s' to '%s'. (%r)", context, self.start_context, self.name ) return diff --git a/synapse/util/presentable_names.py b/synapse/util/presentable_names.py index 4c54812e6f..f68676e9e7 100644 --- a/synapse/util/presentable_names.py +++ b/synapse/util/presentable_names.py @@ -83,7 +83,10 @@ def calculate_room_name(room_state, user_id, fallback_to_members=True, ): if ("m.room.member", my_member_event.sender) in room_state: inviter_member_event = room_state[("m.room.member", my_member_event.sender)] - return "Invite from %s" % (name_from_member_event(inviter_member_event),) + if fallback_to_single_member: + return "Invite from %s" % (name_from_member_event(inviter_member_event),) + else: + return None else: return "Room Invite" diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py index 43cf11f3f6..49527f4d21 100644 --- a/synapse/util/retryutils.py +++ b/synapse/util/retryutils.py @@ -128,7 +128,7 @@ class RetryDestinationLimiter(object): ) valid_err_code = False - if exc_type is CodeMessageException: + if exc_type is not None and issubclass(exc_type, CodeMessageException): valid_err_code = 0 <= exc_val.code < 500 if exc_type is None or valid_err_code: |