summary refs log tree commit diff
path: root/synapse/storage/deviceinbox.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-12-15 18:33:55 +0000
committerGitHub <noreply@github.com>2016-12-15 18:33:55 +0000
commitc824dc727aeeb8557d59251d1539e624af364856 (patch)
tree6f863db7b87d3ecc28fa2cd9dc7b68350ce10b4b /synapse/storage/deviceinbox.py
parentMerge pull request #1698 from matrix-org/erikj/room_list (diff)
parentAdd some logging for syncing to_device events (diff)
downloadsynapse-c824dc727aeeb8557d59251d1539e624af364856.tar.xz
Merge pull request #1704 from matrix-org/rav/log_todevice_syncs
Add some logging for syncing to_device events
Diffstat (limited to 'synapse/storage/deviceinbox.py')
-rw-r--r--synapse/storage/deviceinbox.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py
index 87398d60bc..2821eb89c9 100644
--- a/synapse/storage/deviceinbox.py
+++ b/synapse/storage/deviceinbox.py
@@ -242,7 +242,7 @@ class DeviceInboxStore(SQLBaseStore):
             device_id(str): The recipient device_id.
             up_to_stream_id(int): Where to delete messages up to.
         Returns:
-            A deferred that resolves when the messages have been deleted.
+            A deferred that resolves to the number of messages deleted.
         """
         def delete_messages_for_device_txn(txn):
             sql = (
@@ -251,6 +251,7 @@ class DeviceInboxStore(SQLBaseStore):
                 " AND stream_id <= ?"
             )
             txn.execute(sql, (user_id, device_id, up_to_stream_id))
+            return txn.rowcount
 
         return self.runInteraction(
             "delete_messages_for_device", delete_messages_for_device_txn