ActivityPub-federated video streaming platform using P2P directly in your web browser
Reset video state on studio failure
Chocobozzz8810d63c4086
diff --git a/server/core/lib/job-queue/handlers/video-studio-edition.ts b/server/core/lib/job-queue/handlers/video-studio-edition.tsindex cc5f49d86e..4a03bd179b 100644--- a/server/core/lib/job-queue/handlers/video-studio-edition.ts+++ b/server/core/lib/job-queue/handlers/video-studio-edition.ts@@ -1,6 +1,7 @@import { pick } from '@peertube/peertube-core-utils'import { FFmpegEdition } from '@peertube/peertube-ffmpeg'import {+ VideoState,VideoStudioEditionPayload,VideoStudioTask,VideoStudioTaskCutPayload,@@ -92,6 +93,13 @@ async function processVideoStudioEdition (job: Job) {} catch (err) {await safeCleanupStudioTMPFiles(payload.tasks)+ try {+ const video = await VideoModel.loadFull(payload.videoUUID)+ await video.setNewState(VideoState.PUBLISHED, false, undefined)+ } catch (err) {+ logger.error('Cannot reset video state after studio error', { err, ...lTags })+ }+throw err} finally {if (inputFileMutexReleaser) inputFileMutexReleaser()@@ -106,7 +114,7 @@ export {// ----------------------------------------------------------------------------type TaskProcessorOptions <T extends VideoStudioTaskPayload = VideoStudioTaskPayload> = {+type TaskProcessorOptions<T extends VideoStudioTaskPayload = VideoStudioTaskPayload> = {videoInputPath: stringseparatedAudioInputPath?: stringdiff --git a/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts b/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.tsindex e8357ddef0..edcde8ff98 100644--- a/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts+++ b/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts@@ -32,8 +32,9 @@ type CreateOptions = {}// eslint-disable-next-line max-len-export class VideoStudioTranscodingJobHandler extends AbstractJobHandler<CreateOptions, RunnerJobUpdatePayload, VideoStudioTranscodingSuccess> {-+export class VideoStudioTranscodingJobHandler+ extends AbstractJobHandler<CreateOptions, RunnerJobUpdatePayload, VideoStudioTranscodingSuccess>+{async create (options: CreateOptions) {const { video, priority, tasks } = options@@ -122,7 +123,6 @@ export class VideoStudioTranscodingJobHandler extends AbstractJobHandler<CreateOconst video = await loadRunnerVideo(runnerJob, this.lTags)if (!video) {await safeCleanupStudioTMPFiles(privatePayload.originalTasks)-}const videoFilePath = resultPayload.videoFile as string@@ -131,7 +131,9 @@ export class VideoStudioTranscodingJobHandler extends AbstractJobHandler<CreateOlogger.info('Runner video edition transcoding job %s for %s ended.',- runnerJob.uuid, video.uuid, this.lTags(video.uuid, runnerJob.uuid)+ runnerJob.uuid,+ video.uuid,+ this.lTags(video.uuid, runnerJob.uuid))}