Merge branch 'develop' of github.com:matrix-org/synapse into mysql

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py

index 8604746fb9..4877f45dce 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -91,7 +91,7 @@ class DataStore(RoomMemberStore, RoomStore,
                 "user_agent": user_agent,
                 "last_seen": int(self._clock.time_msec()),
             },
-            or_replace=True,
+            desc="insert_client_ip",
         )
 
     def get_user_ip_and_agents(self, user):
@@ -101,6 +101,7 @@ class DataStore(RoomMemberStore, RoomStore,
             retcols=[
                 "device_id", "access_token", "ip", "user_agent", "last_seen"
             ],
+            desc="get_user_ip_and_agents",
         )