diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-06-06 23:54:00 +0100 |
---|---|---|
committer | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-06 23:54:00 +0100 |
commit | 2d1d7b7e6f2bec3b96b0d23993369ce46aad4f32 (patch) | |
tree | 17328e25d8e35e9ce80b61e94b256ed5be9d8844 /synapse/federation/sender | |
parent | Set default room version to v4. (#5379) (diff) | |
download | synapse-2d1d7b7e6f2bec3b96b0d23993369ce46aad4f32.tar.xz |
Prevent multiple device list updates from breaking a batch send (#5156)
fixes #5153
Diffstat (limited to 'synapse/federation/sender')
-rw-r--r-- | synapse/federation/sender/per_destination_queue.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index fae8bea392..564c57203d 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -349,9 +349,10 @@ class PerDestinationQueue(object): @defer.inlineCallbacks def _get_new_device_messages(self, limit): last_device_list = self._last_device_list_stream_id - # Will return at most 20 entries + + # Retrieve list of new device updates to send to the destination now_stream_id, results = yield self._store.get_devices_by_remote( - self._destination, last_device_list + self._destination, last_device_list, limit=limit, ) edus = [ Edu( |