diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-12-18 17:47:00 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-12-18 17:47:00 +0000 |
commit | dbe77ec79a450f4e7b69d6de247864aad8928ebf (patch) | |
tree | 73faa12eb5e5ad7e5a4eb96e32a2e18e2ac6e234 /synapse | |
parent | Don't yield on sending the event accross federation. (diff) | |
download | synapse-dbe77ec79a450f4e7b69d6de247864aad8928ebf.tar.xz |
Replace distributor deferred list, with a simple for loop until I understand why the former breaks and the latter doesn't
Diffstat (limited to 'synapse')
-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..6e69296d65 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(results) + defer.returnValue(results) |