Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-08-29 21:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull out update_results_dict

Browse Source
This commit is contained in:
Erik Johnston 2016-06-03 11:47:07 +01:00
parent e043ede4a2
commit 58a224a651
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ import os
import functools import functools
import inspect import inspect
import threading import threading
import itertools
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -357,17 +357,16 @@ class CacheListDescriptor(object):
cached_defers[arg] = res cached_defers[arg] = res
if cached_defers: if cached_defers:
def update_results_dict(res):
results.update(res)
return results
return preserve_context_over_deferred(defer.gatherResults( return preserve_context_over_deferred(defer.gatherResults(
cached_defers.values(), cached_defers.values(),
consumeErrors=True, consumeErrors=True,
).addCallback( ).addCallback(update_results_dict).addErrback(
lambda res: {
k: v
for k, v in itertools.chain(results.items(), res)
}
)).addErrback(
unwrapFirstError unwrapFirstError
) ))
else: else:
return results return results