Fix video views
This commit is contained in:
parent
ac3d2e0569
commit
63dc589865
|
@ -14,7 +14,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
const LAST_MIGRATION_VERSION = 375
|
const LAST_MIGRATION_VERSION = 380
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
29
server/initializers/migrations/0380-cleanup-timestamps.ts
Normal file
29
server/initializers/migrations/0380-cleanup-timestamps.ts
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
import * as Sequelize from 'sequelize'
|
||||||
|
|
||||||
|
async function up (utils: {
|
||||||
|
transaction: Sequelize.Transaction,
|
||||||
|
queryInterface: Sequelize.QueryInterface,
|
||||||
|
sequelize: Sequelize.Sequelize,
|
||||||
|
db: any
|
||||||
|
}): Promise<void> {
|
||||||
|
try {
|
||||||
|
await utils.queryInterface.removeColumn('application', 'createdAt')
|
||||||
|
} catch { /* the column could not exist */ }
|
||||||
|
|
||||||
|
try {
|
||||||
|
await utils.queryInterface.removeColumn('application', 'updatedAt')
|
||||||
|
} catch { /* the column could not exist */ }
|
||||||
|
|
||||||
|
try {
|
||||||
|
await utils.queryInterface.removeColumn('videoView', 'updatedAt')
|
||||||
|
} catch { /* the column could not exist */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
function down (options) {
|
||||||
|
throw new Error('Not implemented.')
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
up,
|
||||||
|
down
|
||||||
|
}
|
|
@ -27,6 +27,12 @@ async function processVideosViews () {
|
||||||
logger.debug('Adding %d views to video %d in hour %d.', views, videoId, hour)
|
logger.debug('Adding %d views to video %d in hour %d.', views, videoId, hour)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
|
||||||
|
if (!video) {
|
||||||
|
logger.debug('Video %d does not exist anymore, skipping videos view addition.', videoId)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
await VideoViewModel.create({
|
await VideoViewModel.create({
|
||||||
startDate,
|
startDate,
|
||||||
endDate,
|
endDate,
|
||||||
|
@ -34,7 +40,6 @@ async function processVideosViews () {
|
||||||
videoId
|
videoId
|
||||||
})
|
})
|
||||||
|
|
||||||
const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
|
|
||||||
if (video.isOwned()) {
|
if (video.isOwned()) {
|
||||||
// If this is a remote video, the origin instance will send us an update
|
// If this is a remote video, the origin instance will send us an update
|
||||||
await VideoModel.incrementViews(videoId, views)
|
await VideoModel.incrementViews(videoId, views)
|
||||||
|
@ -44,13 +49,13 @@ async function processVideosViews () {
|
||||||
await federateVideoIfNeeded(video, false)
|
await federateVideoIfNeeded(video, false)
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.debug('Cannot create video views for video %d in hour %d. Maybe the video does not exist anymore?', videoId, hour)
|
logger.error('Cannot create video views for video %d in hour %d.', videoId, hour, { err })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await Redis.Instance.deleteVideoViews(videoId, hour)
|
await Redis.Instance.deleteVideoViews(videoId, hour)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error('Cannot update video views of video %d in hour %d.', videoId, hour)
|
logger.error('Cannot update video views of video %d in hour %d.', videoId, hour, { err })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user