X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fschedulers%2Fupdate-videos-scheduler.ts;h=c652682dd6a7f4b19a584856dc040e90e2b1ae77;hb=619537426bbb9fcb9f2825068d5f907db0dc1f09;hp=956780a776529ba1b77967f39e577e496d99d9eb;hpb=cf59a2a0c367683ba35758419499bf6087c192ec;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/schedulers/update-videos-scheduler.ts b/server/lib/schedulers/update-videos-scheduler.ts
index 956780a77..c652682dd 100644
--- a/server/lib/schedulers/update-videos-scheduler.ts
+++ b/server/lib/schedulers/update-videos-scheduler.ts
@@ -1,36 +1,37 @@
+import { VideoModel } from '@server/models/video/video'
+import { MVideoFullLight } from '@server/types/models'
 import { logger } from '../../helpers/logger'
-import { AbstractScheduler } from './abstract-scheduler'
-import { ScheduleVideoUpdateModel } from '../../models/video/schedule-video-update'
-import { retryTransactionWrapper } from '../../helpers/database-utils'
-import { federateVideoIfNeeded } from '../activitypub'
 import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants'
-import { Notifier } from '../notifier'
 import { sequelizeTypescript } from '../../initializers/database'
-import { MVideoFullLight } from '@server/typings/models'
+import { ScheduleVideoUpdateModel } from '../../models/video/schedule-video-update'
+import { federateVideoIfNeeded } from '../activitypub/videos'
+import { Notifier } from '../notifier'
+import { AbstractScheduler } from './abstract-scheduler'
 
 export class UpdateVideosScheduler extends AbstractScheduler {
 
   private static instance: AbstractScheduler
 
-  protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.updateVideos
+  protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.UPDATE_VIDEOS
 
   private constructor () {
     super()
   }
 
   protected async internalExecute () {
-    return retryTransactionWrapper(this.updateVideos.bind(this))
+    return this.updateVideos()
   }
 
   private async updateVideos () {
     if (!await ScheduleVideoUpdateModel.areVideosToUpdate()) return undefined
 
-    const publishedVideos = await sequelizeTypescript.transaction(async t => {
-      const schedules = await ScheduleVideoUpdateModel.listVideosToUpdate(t)
-      const publishedVideos: MVideoFullLight[] = []
+    const schedules = await ScheduleVideoUpdateModel.listVideosToUpdate()
+    const publishedVideos: MVideoFullLight[] = []
+
+    for (const schedule of schedules) {
+      await sequelizeTypescript.transaction(async t => {
+        const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(schedule.videoId, t)
 
-      for (const schedule of schedules) {
-        const video = schedule.Video
         logger.info('Executing scheduled video update on %s.', video.uuid)
 
         if (schedule.privacy) {
@@ -42,16 +43,13 @@ export class UpdateVideosScheduler extends AbstractScheduler {
           await federateVideoIfNeeded(video, isNewVideo, t)
 
           if (wasConfidentialVideo) {
-            const videoToPublish: MVideoFullLight = Object.assign(video, { ScheduleVideoUpdate: schedule, UserVideoHistories: [] })
-            publishedVideos.push(videoToPublish)
+            publishedVideos.push(video)
           }
         }
 
         await schedule.destroy({ transaction: t })
-      }
-
-      return publishedVideos
-    })
+      })
+    }
 
     for (const v of publishedVideos) {
       Notifier.Instance.notifyOnNewVideoIfNeeded(v)