Add last seen info to devices table.

This allows us to purge old user_ips entries without having to preserve
the latest last seen info for active devices.
This commit is contained in:
Erik Johnston 2019-09-23 14:16:10 +01:00
parent 1b519e0272
commit 2ade05dca3
2 changed files with 36 additions and 0 deletions

View File

@ -354,6 +354,21 @@ class ClientIpStore(background_updates.BackgroundUpdateStore):
}, },
lock=False, lock=False,
) )
# Technically an access token might not be associated with
# a device so we need to check.
if device_id:
self._simple_upsert_txn(
txn,
table="devices",
keyvalues={"user_id": user_id, "device_id": device_id},
values={
"user_agent": user_agent,
"last_seen": last_seen,
"ip": ip,
},
lock=False,
)
except Exception as e: except Exception as e:
# Failed to upsert, log and continue # Failed to upsert, log and continue
logger.error("Failed to insert client IP %r: %r", entry, e) logger.error("Failed to insert client IP %r: %r", entry, e)

View File

@ -0,0 +1,21 @@
/* Copyright 2019 Matrix.org Foundation CIC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-- Track last seen information for a device in the devices table, rather
-- than relying on it being in the user_ips table (which we want to be able
-- to purge old entries from)
ALTER TABLE devices ADD COLUMN last_seen BIGINT;
ALTER TABLE devices ADD COLUMN ip TEXT;
ALTER TABLE devices ADD COLUMN user_agent TEXT;