diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-15 11:00:25 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:51 +0100 |
| commit | 608624252466acf9f1d9ee1c1170bd4fe4d18d18 (patch) | |
| tree | 47eab55bb5421b7fe88e0b2ac743a436fd9561cf /server/lib/jobs | |
| parent | 51548b31815c6f96f314ae96588a9adca150519d (diff) | |
| download | PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.gz PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.zst PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.zip | |
Rename Pod -> Server
Diffstat (limited to 'server/lib/jobs')
| -rw-r--r-- | server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts | 4 | ||||
| -rw-r--r-- | server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts index 47603a66c..d3ee886e7 100644 --- a/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts +++ b/server/lib/jobs/transcoding-job-scheduler/video-file-optimizer-handler.ts | |||
| @@ -8,7 +8,7 @@ import { JobScheduler } from '../job-scheduler' | |||
| 8 | import { TranscodingJobPayload } from './transcoding-job-scheduler' | 8 | import { TranscodingJobPayload } from './transcoding-job-scheduler' |
| 9 | 9 | ||
| 10 | async function process (data: TranscodingJobPayload, jobId: number) { | 10 | async function process (data: TranscodingJobPayload, jobId: number) { |
| 11 | const video = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(data.videoUUID) | 11 | const video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(data.videoUUID) |
| 12 | // No video, maybe deleted? | 12 | // No video, maybe deleted? |
| 13 | if (!video) { | 13 | if (!video) { |
| 14 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) | 14 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) |
| @@ -31,7 +31,7 @@ async function onSuccess (jobId: number, video: VideoInstance, jobScheduler: Job | |||
| 31 | logger.info('Job %d is a success.', jobId) | 31 | logger.info('Job %d is a success.', jobId) |
| 32 | 32 | ||
| 33 | // Maybe the video changed in database, refresh it | 33 | // Maybe the video changed in database, refresh it |
| 34 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(video.uuid) | 34 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid) |
| 35 | // Video does not exist anymore | 35 | // Video does not exist anymore |
| 36 | if (!videoDatabase) return undefined | 36 | if (!videoDatabase) return undefined |
| 37 | 37 | ||
diff --git a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts index 77e5d9f7f..4f2ce3d24 100644 --- a/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts +++ b/server/lib/jobs/transcoding-job-scheduler/video-file-transcoder-handler.ts | |||
| @@ -5,7 +5,7 @@ import { VideoInstance } from '../../../models' | |||
| 5 | import { sendUpdateVideo } from '../../activitypub/send-request' | 5 | import { sendUpdateVideo } from '../../activitypub/send-request' |
| 6 | 6 | ||
| 7 | async function process (data: { videoUUID: string, resolution: VideoResolution }, jobId: number) { | 7 | async function process (data: { videoUUID: string, resolution: VideoResolution }, jobId: number) { |
| 8 | const video = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(data.videoUUID) | 8 | const video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(data.videoUUID) |
| 9 | // No video, maybe deleted? | 9 | // No video, maybe deleted? |
| 10 | if (!video) { | 10 | if (!video) { |
| 11 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) | 11 | logger.info('Do not process job %d, video does not exist.', jobId, { videoUUID: video.uuid }) |
| @@ -28,7 +28,7 @@ async function onSuccess (jobId: number, video: VideoInstance) { | |||
| 28 | logger.info('Job %d is a success.', jobId) | 28 | logger.info('Job %d is a success.', jobId) |
| 29 | 29 | ||
| 30 | // Maybe the video changed in database, refresh it | 30 | // Maybe the video changed in database, refresh it |
| 31 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(video.uuid) | 31 | const videoDatabase = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid) |
| 32 | // Video does not exist anymore | 32 | // Video does not exist anymore |
| 33 | if (!videoDatabase) return undefined | 33 | if (!videoDatabase) return undefined |
| 34 | 34 | ||