yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

Merge branch 'release/v1.3.0' into develop

Browse source
This commit is contained in:
Chocobozzz 2019-05-21 13:32:00 +02:00
commit 21d141c296
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 79 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
server/lib/job-queue/handlers/video-views.ts
View file

@ -27,6 +27,12 @@ async function processVideosViews () {
logger.debug('Adding %d views to video %d in hour %d.', views, videoId, hour)
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({
startDate,
endDate,
@ -34,7 +40,6 @@ async function processVideosViews () {
videoId
})
const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(videoId)
if (video.isOwned()) {
// If this is a remote video, the origin instance will send us an update
await VideoModel.incrementViews(videoId, views)
@ -44,13 +49,13 @@ async function processVideosViews () {
await federateVideoIfNeeded(video, false)
}
} 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)
} 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 })
}
}
}