summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-03-15 13:07:50 +0000
committerGitHub <noreply@github.com>2017-03-15 13:07:50 +0000
commit5f14e7e9820c024cdf1b55337eeb1bdb05e557f8 (patch)
tree9fb244c8c00d9d01cd0856f0efc028caf53f4688 /synapse/util
parentMerge pull request #2008 from matrix-org/erikj/notifier_stats (diff)
parentFix assertion to stop transaction queue getting wedged (diff)
downloadsynapse-5f14e7e9820c024cdf1b55337eeb1bdb05e557f8.tar.xz
Merge pull request #2010 from matrix-org/rav/fix_txnq_wedge
Fix assertion to stop transaction queue getting wedged
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/caches/stream_change_cache.py2
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()