diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-19 13:40:02 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-19 13:40:02 +0000 |
| commit | 45a6869cb46ec07c475fca2fee83e4c906a54e94 (patch) | |
| tree | 9714da089fd65cd5820b8f8353fcd244102448b2 /synapse/util/distributor.py | |
| parent | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff) | |
| parent | Bump web sdk version to 0.6.0 (diff) | |
| download | synapse-45a6869cb46ec07c475fca2fee83e4c906a54e94.tar.xz | |
Merge branch 'release-v0.6.0' v0.6.0
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) |