diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-17 15:46:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-17 15:48:04 +0000 |
| commit | f8ee66250a16cb9dd3af01fb1150ff18cfebbc39 (patch) | |
| tree | 9920bd4e8164f705b4e27c714d6c053082dcf7a5 /synapse/replication/slave/storage/deviceinbox.py | |
| parent | Hook up the send queue and create a federation sender worker (diff) | |
| download | synapse-f8ee66250a16cb9dd3af01fb1150ff18cfebbc39.tar.xz | |
Handle sending events and device messages over federation
Diffstat (limited to 'synapse/replication/slave/storage/deviceinbox.py')
| -rw-r--r-- | synapse/replication/slave/storage/deviceinbox.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/synapse/replication/slave/storage/deviceinbox.py b/synapse/replication/slave/storage/deviceinbox.py index 373212d42d..cc860f9f9b 100644 --- a/synapse/replication/slave/storage/deviceinbox.py +++ b/synapse/replication/slave/storage/deviceinbox.py @@ -38,6 +38,7 @@ class SlavedDeviceInboxStore(BaseSlavedStore): get_new_messages_for_device = DataStore.get_new_messages_for_device.__func__ get_new_device_msgs_for_remote = DataStore.get_new_device_msgs_for_remote.__func__ delete_messages_for_device = DataStore.delete_messages_for_device.__func__ + delete_device_msgs_for_remote = DataStore.delete_device_msgs_for_remote.__func__ def stream_positions(self): result = super(SlavedDeviceInboxStore, self).stream_positions() @@ -50,9 +51,15 @@ class SlavedDeviceInboxStore(BaseSlavedStore): self._device_inbox_id_gen.advance(int(stream["position"])) for row in stream["rows"]: stream_id = row[0] - user_id = row[1] - self._device_inbox_stream_cache.entity_has_changed( - user_id, stream_id - ) + entity = row[1] + + if entity.startswith("@"): + self._device_inbox_stream_cache.entity_has_changed( + entity, stream_id + ) + else: + self._device_federation_outbox_stream_cache.entity_has_changed( + entity, stream_id + ) return super(SlavedDeviceInboxStore, self).process_replication(result) |