mirror of
https://github.com/Chocobozzz/PeerTube.git
synced 2025-10-03 09:49:20 +02:00
Optimize updating oauth tokens activity
This commit is contained in:
parent
efa32646ed
commit
bbc1afada5
4 changed files with 10 additions and 14 deletions
|
@ -185,7 +185,7 @@
|
|||
"."
|
||||
],
|
||||
"sass": {
|
||||
"silenceDeprecations": [ "import", "mixed-decls", "color-functions", "global-builtin" ]
|
||||
"silenceDeprecations": [ "import", "color-functions", "global-builtin" ]
|
||||
}
|
||||
},
|
||||
"assets": [
|
||||
|
|
|
@ -7,7 +7,7 @@ export function getCSSConfig (root: string) {
|
|||
api: 'modern-compiler',
|
||||
loadPaths: [ resolve(root, './src/sass/include') ],
|
||||
// FIXME: Wait for bootstrap upgrade that fixes deprecated sass utils
|
||||
silenceDeprecations: [ 'import', 'mixed-decls', 'color-functions', 'global-builtin' ]
|
||||
silenceDeprecations: [ 'import', 'color-functions', 'global-builtin' ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,6 @@ import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants.js'
|
|||
import { AbstractScheduler } from './abstract-scheduler.js'
|
||||
|
||||
type UpdatePayload = {
|
||||
id: number
|
||||
lastActivityDate: Date
|
||||
lastActivityIP: string
|
||||
lastActivityDevice: string
|
||||
|
@ -14,29 +13,27 @@ export class UpdateTokenSessionScheduler extends AbstractScheduler {
|
|||
|
||||
protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.UPDATE_TOKEN_SESSION
|
||||
|
||||
private readonly toUpdate = new Set<UpdatePayload>()
|
||||
private toUpdate = new Map<number, UpdatePayload>()
|
||||
|
||||
private constructor () {
|
||||
super()
|
||||
}
|
||||
|
||||
addToUpdate (payload: UpdatePayload) {
|
||||
this.toUpdate.add(payload)
|
||||
addToUpdate (id: number, payload: UpdatePayload) {
|
||||
this.toUpdate.set(id, payload)
|
||||
}
|
||||
|
||||
protected async internalExecute () {
|
||||
const toUpdate = Array.from(this.toUpdate)
|
||||
this.toUpdate.clear()
|
||||
const entriesToUpdate = this.toUpdate.entries()
|
||||
this.toUpdate = new Map()
|
||||
|
||||
for (const payload of toUpdate) {
|
||||
for (const [ id, payload ] of entriesToUpdate) {
|
||||
await OAuthTokenModel.update({
|
||||
lastActivityDate: payload.lastActivityDate,
|
||||
lastActivityIP: payload.lastActivityIP,
|
||||
lastActivityDevice: payload.lastActivityDevice
|
||||
}, {
|
||||
where: {
|
||||
id: payload.id
|
||||
},
|
||||
where: { id },
|
||||
// Prevent tokens cache invalidation, we don't update fields that are meaningful for this cache
|
||||
hooks: false
|
||||
})
|
||||
|
|
|
@ -13,8 +13,7 @@ export function authenticate (req: express.Request, res: express.Response, next:
|
|||
res.locals.oauth = { token }
|
||||
res.locals.authenticated = true
|
||||
|
||||
UpdateTokenSessionScheduler.Instance.addToUpdate({
|
||||
id: token.id,
|
||||
UpdateTokenSessionScheduler.Instance.addToUpdate(token.id, {
|
||||
lastActivityDate: new Date(),
|
||||
lastActivityIP: req.ip,
|
||||
lastActivityDevice: req.header('user-agent')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue