diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-15 13:36:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-05-15 13:36:29 +0100 |
| commit | a9fc71c372ede8b704df7810c0380dc52e1254c2 (patch) | |
| tree | 4577f169a32528071d01b73feb19c16922073961 /synapse/util | |
| parent | Merge branch 'erikj/fix_config_ratelimiting' into erikj/test (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-a9fc71c372ede8b704df7810c0380dc52e1254c2.tar.xz | |
Merge branch 'erikj/refactor_pagination_bounds' into erikj/reactions_base
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/async_helpers.py | 2 | ||||
| -rw-r--r-- | synapse/util/distributor.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py index 9a17dfdab2..7253ba120f 100644 --- a/synapse/util/async_helpers.py +++ b/synapse/util/async_helpers.py @@ -166,7 +166,7 @@ def yieldable_gather_results(func, iter, *args, **kwargs): *args: Arguments to be passed to each call to func Returns - Deferred: Resolved when all functions have been invoked, or errors if + Deferred[list]: Resolved when all functions have been invoked, or errors if one of the function calls fails. """ return logcontext.make_deferred_yieldable(defer.gatherResults([ diff --git a/synapse/util/distributor.py b/synapse/util/distributor.py index 194da87639..e14c8bdfda 100644 --- a/synapse/util/distributor.py +++ b/synapse/util/distributor.py @@ -27,6 +27,7 @@ def user_left_room(distributor, user, room_id): distributor.fire("user_left_room", user=user, room_id=room_id) +# XXX: this is no longer used. We should probably kill it. def user_joined_room(distributor, user, room_id): distributor.fire("user_joined_room", user=user, room_id=room_id) |