diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-03-15 12:16:55 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-03-15 12:16:55 +0000 |
| commit | 29ed09e80a8c7ddeebe3f257a336e4c387a06c88 (patch) | |
| tree | 9fb244c8c00d9d01cd0856f0efc028caf53f4688 /synapse/storage/devices.py | |
| parent | Merge pull request #2008 from matrix-org/erikj/notifier_stats (diff) | |
| download | synapse-29ed09e80a8c7ddeebe3f257a336e4c387a06c88.tar.xz | |
Fix assertion to stop transaction queue getting wedged
... and update some docstrings to correctly reflect the types being used. get_new_device_msgs_for_remote can return a long under some circumstances, which was being stored in last_device_list_stream_id_by_dest, and was then upsetting things on the next loop.
Diffstat (limited to 'synapse/storage/devices.py')
| -rw-r--r-- | synapse/storage/devices.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index 563071b7a9..e545b62e39 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -308,7 +308,7 @@ class DeviceStore(SQLBaseStore): """Get stream of updates to send to remote servers Returns: - (now_stream_id, [ { updates }, .. ]) + (int, list[dict]): current stream id and list of updates """ now_stream_id = self._device_list_id_gen.get_current_token() |