diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-18 18:57:21 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-18 18:57:21 +0000 |
| commit | 41ce544abe77e34b714d4468dd895b184a12b19c (patch) | |
| tree | 6d044900b3bb1fcc57e1f0868376aeed490bf7b3 /synapse/util/distributor.py | |
| parent | Test some ideas that might help performance a bit (diff) | |
| parent | Supply auth_chain along with current state in '/state/', fetch auth events fr... (diff) | |
| download | synapse-41ce544abe77e34b714d4468dd895b184a12b19c.tar.xz | |
Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse/util/distributor.py')
| -rw-r--r-- | synapse/util/distributor.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/util/distributor.py b/synapse/util/distributor.py index 701ccdb781..6925ac96b6 100644 --- a/synapse/util/distributor.py +++ b/synapse/util/distributor.py @@ -115,10 +115,10 @@ class Signal(object): failure.value, failure.getTracebackObject())) if not self.suppress_failures: - raise failure + failure.raiseException() deferreds.append(d.addErrback(eb)) - - result = yield defer.DeferredList( - deferreds, fireOnOneErrback=not self.suppress_failures - ) - defer.returnValue(result) + results = [] + for deferred in deferreds: + result = yield deferred + results.append(result) + defer.returnValue(results) |