Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-20 19:54:07 -04:00
Code Issues Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

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

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