diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-27 15:23:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-27 15:23:48 +0000 |
| commit | d1e1fd62108c9b285d7c57d357311c6d5df2190e (patch) | |
| tree | df9bdd246b4e8880377a0d2fa5bd09594cff9ef1 | |
| parent | Hook device list updates to replication (diff) | |
| download | synapse-d1e1fd62108c9b285d7c57d357311c6d5df2190e.tar.xz | |
Add ts column to device_lists_outbound_pokes
| -rw-r--r-- | synapse/storage/devices.py | 3 | ||||
| -rw-r--r-- | synapse/storage/schema/delta/40/device_list_streams.sql | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index 2b2cebacfa..89c7bc0cc0 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -486,6 +486,8 @@ class DeviceStore(SQLBaseStore): defer.returnValue(stream_id) def _add_device_change_txn(self, txn, user_id, device_ids, hosts, stream_id): + now = self._clock.time_msec() + txn.call_after( self._device_list_stream_cache.entity_has_changed, user_id, stream_id, @@ -519,6 +521,7 @@ class DeviceStore(SQLBaseStore): "user_id": user_id, "device_id": device_id, "sent": False, + "ts": now, } for destination in hosts for device_id in device_ids diff --git a/synapse/storage/schema/delta/40/device_list_streams.sql b/synapse/storage/schema/delta/40/device_list_streams.sql index 8348c143c3..54841b3843 100644 --- a/synapse/storage/schema/delta/40/device_list_streams.sql +++ b/synapse/storage/schema/delta/40/device_list_streams.sql @@ -51,7 +51,8 @@ CREATE TABLE device_lists_outbound_pokes ( stream_id BIGINT NOT NULL, user_id TEXT NOT NULL, device_id TEXT NOT NULL, - sent BOOLEAN NOT NULL + sent BOOLEAN NOT NULL, + ts BIGINT NOT NULL -- So that in future we can clear out pokes to dead servers ); CREATE INDEX device_lists_outbound_pokes_id ON device_lists_outbound_pokes(destination, stream_id); |