diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-20 16:31:48 +0000 |
| commit | f6583796feeff5a50c0988ce674a1ab861b14e34 (patch) | |
| tree | 47f9d5934440eef201c6ab65a0fb8df06631d18d /synapse/storage/__init__.py | |
| parent | Rearrange storage modules (diff) | |
| parent | Merge pull request #113 from matrix-org/store_rearrangement (diff) | |
| download | synapse-f6583796feeff5a50c0988ce674a1ab861b14e34.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 3 |
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", ) |