diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-09-18 12:00:49 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-09-19 09:54:37 +0200 |
| commit | 627621c1e8d37c33f7b3dd59f4c8907b12c630bc (patch) | |
| tree | 007e7118f482c543d3898b222b62c185fda4fd2b /server/lib/job-queue/handlers/video-file.ts | |
| parent | e972e046dbe9b499944c4fab9220eee13e31ac1b (diff) | |
| download | PeerTube-627621c1e8d37c33f7b3dd59f4c8907b12c630bc.tar.gz PeerTube-627621c1e8d37c33f7b3dd59f4c8907b12c630bc.tar.zst PeerTube-627621c1e8d37c33f7b3dd59f4c8907b12c630bc.zip | |
Optimize SQL requests of watch page API endpoints
Diffstat (limited to 'server/lib/job-queue/handlers/video-file.ts')
| -rw-r--r-- | server/lib/job-queue/handlers/video-file.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/job-queue/handlers/video-file.ts b/server/lib/job-queue/handlers/video-file.ts index 2c9ca8e12..1463c93fc 100644 --- a/server/lib/job-queue/handlers/video-file.ts +++ b/server/lib/job-queue/handlers/video-file.ts | |||
| @@ -26,7 +26,7 @@ async function processVideoFileImport (job: Bull.Job) { | |||
| 26 | const payload = job.data as VideoFileImportPayload | 26 | const payload = job.data as VideoFileImportPayload |
| 27 | logger.info('Processing video file import in job %d.', job.id) | 27 | logger.info('Processing video file import in job %d.', job.id) |
| 28 | 28 | ||
| 29 | const video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(payload.videoUUID) | 29 | const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID) |
| 30 | // No video, maybe deleted? | 30 | // No video, maybe deleted? |
| 31 | if (!video) { | 31 | if (!video) { |
| 32 | logger.info('Do not process job %d, video does not exist.', job.id) | 32 | logger.info('Do not process job %d, video does not exist.', job.id) |
| @@ -43,7 +43,7 @@ async function processVideoFile (job: Bull.Job) { | |||
| 43 | const payload = job.data as VideoFilePayload | 43 | const payload = job.data as VideoFilePayload |
| 44 | logger.info('Processing video file in job %d.', job.id) | 44 | logger.info('Processing video file in job %d.', job.id) |
| 45 | 45 | ||
| 46 | const video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(payload.videoUUID) | 46 | const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID) |
| 47 | // No video, maybe deleted? | 47 | // No video, maybe deleted? |
| 48 | if (!video) { | 48 | if (!video) { |
| 49 | logger.info('Do not process job %d, video does not exist.', job.id) | 49 | logger.info('Do not process job %d, video does not exist.', job.id) |
| @@ -69,7 +69,7 @@ async function onVideoFileTranscoderOrImportSuccess (video: VideoModel) { | |||
| 69 | 69 | ||
| 70 | return sequelizeTypescript.transaction(async t => { | 70 | return sequelizeTypescript.transaction(async t => { |
| 71 | // Maybe the video changed in database, refresh it | 71 | // Maybe the video changed in database, refresh it |
| 72 | let videoDatabase = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid, t) | 72 | let videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t) |
| 73 | // Video does not exist anymore | 73 | // Video does not exist anymore |
| 74 | if (!videoDatabase) return undefined | 74 | if (!videoDatabase) return undefined |
| 75 | 75 | ||
| @@ -99,7 +99,7 @@ async function onVideoFileOptimizerSuccess (video: VideoModel, isNewVideo: boole | |||
| 99 | 99 | ||
| 100 | return sequelizeTypescript.transaction(async t => { | 100 | return sequelizeTypescript.transaction(async t => { |
| 101 | // Maybe the video changed in database, refresh it | 101 | // Maybe the video changed in database, refresh it |
| 102 | const videoDatabase = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid, t) | 102 | const videoDatabase = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t) |
| 103 | // Video does not exist anymore | 103 | // Video does not exist anymore |
| 104 | if (!videoDatabase) return undefined | 104 | if (!videoDatabase) return undefined |
| 105 | 105 | ||