Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-28 02:09:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix to ensure cache descriptors always return deferreds

Browse Source
This commit is contained in:
Erik Johnston 2019-10-28 13:33:04 +00:00
parent bcfc647e4d
commit d0d8a22c13
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/push/bulk_push_rule_evaluator.py
View File

@ -79,7 +79,7 @@ class BulkPushRuleEvaluator(object):
dict of user_id -> push_rules dict of user_id -> push_rules
""" """
room_id = event.room_id room_id = event.room_id
rules_for_room = self._get_rules_for_room(room_id) rules_for_room = yield self._get_rules_for_room(room_id)
rules_by_user = yield rules_for_room.get_rules(event, context) rules_by_user = yield rules_for_room.get_rules(event, context)

2
synapse/storage/data_stores/main/roommember.py
View File

@ -720,7 +720,7 @@ class RoomMemberWorkerStore(EventsWorkerStore):
# See bulk_get_push_rules_for_room for how we work around this. # See bulk_get_push_rules_for_room for how we work around this.
assert state_group is not None assert state_group is not None
cache = self._get_joined_hosts_cache(room_id) cache = yield self._get_joined_hosts_cache(room_id)
joined_hosts = yield cache.get_destinations(state_entry) joined_hosts = yield cache.get_destinations(state_entry)
return joined_hosts return joined_hosts

4
synapse/util/caches/descriptors.py
View File

@ -438,7 +438,7 @@ class CacheDescriptor(_CacheDescriptorBase):
if isinstance(cached_result_d, ObservableDeferred): if isinstance(cached_result_d, ObservableDeferred):
observer = cached_result_d.observe() observer = cached_result_d.observe()
else: else:
observer = cached_result_d observer = defer.succeed(cached_result_d)
except KeyError: except KeyError:
ret = defer.maybeDeferred( ret = defer.maybeDeferred(
@ -618,7 +618,7 @@ class CacheListDescriptor(_CacheDescriptorBase):
) )
return make_deferred_yieldable(d) return make_deferred_yieldable(d)
else: else:
return results return defer.succeed(results)
obj.__dict__[self.orig.__name__] = wrapped obj.__dict__[self.orig.__name__] = wrapped

4
tests/util/caches/test_descriptors.py
View File

@ -325,9 +325,9 @@ class DescriptorTestCase(unittest.TestCase):
self.assertEqual(len(obj.fn.cache.cache), 3) self.assertEqual(len(obj.fn.cache.cache), 3)
r = obj.fn(1, 2) r = obj.fn(1, 2)
self.assertEqual(r, ["spam", "eggs"]) self.assertEqual(r.result, ["spam", "eggs"])
r = obj.fn(1, 3) r = obj.fn(1, 3)
self.assertEqual(r, ["chips"]) self.assertEqual(r.result, ["chips"])
obj.mock.assert_not_called() obj.mock.assert_not_called()
def test_cache_iterable_with_sync_exception(self): def test_cache_iterable_with_sync_exception(self):