diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-03-15 13:07:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-15 13:07:50 +0000 |
commit | 5f14e7e9820c024cdf1b55337eeb1bdb05e557f8 (patch) | |
tree | 9fb244c8c00d9d01cd0856f0efc028caf53f4688 /synapse/replication | |
parent | Merge pull request #2008 from matrix-org/erikj/notifier_stats (diff) | |
parent | Fix assertion to stop transaction queue getting wedged (diff) | |
download | synapse-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/replication')
-rw-r--r-- | synapse/replication/slave/storage/_slaved_id_tracker.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/_slaved_id_tracker.py b/synapse/replication/slave/storage/_slaved_id_tracker.py index 24b5c79d4a..9d1d173b2f 100644 --- a/synapse/replication/slave/storage/_slaved_id_tracker.py +++ b/synapse/replication/slave/storage/_slaved_id_tracker.py @@ -27,4 +27,9 @@ class SlavedIdTracker(object): self._current = (max if self.step > 0 else min)(self._current, new_id) def get_current_token(self): + """ + + Returns: + int + """ return self._current |