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/util | |
| 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/util')
| -rw-r--r-- | synapse/util/caches/stream_change_cache.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/stream_change_cache.py b/synapse/util/caches/stream_change_cache.py index b72bb0ff02..70fe00ce0b 100644 --- a/synapse/util/caches/stream_change_cache.py +++ b/synapse/util/caches/stream_change_cache.py @@ -50,7 +50,7 @@ class StreamChangeCache(object): def has_entity_changed(self, entity, stream_pos): """Returns True if the entity may have been updated since stream_pos """ - assert type(stream_pos) is int + assert type(stream_pos) is int or type(stream_pos) is long if stream_pos < self._earliest_known_stream_pos: self.metrics.inc_misses() |