1 files changed, 46 insertions, 39 deletions

diff --git a/packages/peertube-runner/server/process/shared/process-vod.ts b/packages/peertube-runner/server/process/shared/process-vod.ts
index d84ece3cb..22489afd5 100644
--- a/packages/peertube-runner/server/process/shared/process-vod.ts
+++ b/packages/peertube-runner/server/process/shared/process-vod.ts
@@ -22,31 +22,34 @@ export async function processWebVideoTranscoding (options: ProcessOptions<Runner
 
   const outputPath = join(ConfigManager.Instance.getTranscodingDirectory(), `output-${buildUUID()}.mp4`)
 
-  await ffmpegVod.transcode({
-    type: 'video',
-
-    inputPath,
+  try {
+    await ffmpegVod.transcode({
+      type: 'video',
 
-    outputPath,
+      inputPath,
 
-    inputFileMutexReleaser: () => {},
+      outputPath,
 
-    resolution: payload.output.resolution,
-    fps: payload.output.fps
-  })
+      inputFileMutexReleaser: () => {},
 
-  const successBody: VODWebVideoTranscodingSuccess = {
-    videoFile: outputPath
-  }
+      resolution: payload.output.resolution,
+      fps: payload.output.fps
+    })
 
-  await server.runnerJobs.success({
-    jobToken: job.jobToken,
-    jobUUID: job.uuid,
-    runnerToken,
-    payload: successBody
-  })
+    const successBody: VODWebVideoTranscodingSuccess = {
+      videoFile: outputPath
+    }
 
-  await remove(outputPath)
+    await server.runnerJobs.success({
+      jobToken: job.jobToken,
+      jobUUID: job.uuid,
+      runnerToken,
+      payload: successBody
+    })
+  } finally {
+    await remove(inputPath)
+    await remove(outputPath)
+  }
 }
 
 export async function processHLSTranscoding (options: ProcessOptions<RunnerJobVODHLSTranscodingPayload>) {
@@ -105,30 +108,34 @@ export async function processAudioMergeTranscoding (options: ProcessOptions<Runn
 
   const ffmpegVod = buildFFmpegVOD({ job, server, runnerToken })
 
-  await ffmpegVod.transcode({
-    type: 'merge-audio',
-
-    audioPath,
-    inputPath,
+  try {
+    await ffmpegVod.transcode({
+      type: 'merge-audio',
 
-    outputPath,
+      audioPath,
+      inputPath,
 
-    inputFileMutexReleaser: () => {},
+      outputPath,
 
-    resolution: payload.output.resolution,
-    fps: payload.output.fps
-  })
+      inputFileMutexReleaser: () => {},
 
-  const successBody: VODAudioMergeTranscodingSuccess = {
-    videoFile: outputPath
-  }
+      resolution: payload.output.resolution,
+      fps: payload.output.fps
+    })
 
-  await server.runnerJobs.success({
-    jobToken: job.jobToken,
-    jobUUID: job.uuid,
-    runnerToken,
-    payload: successBody
-  })
+    const successBody: VODAudioMergeTranscodingSuccess = {
+      videoFile: outputPath
+    }
 
-  await remove(outputPath)
+    await server.runnerJobs.success({
+      jobToken: job.jobToken,
+      jobUUID: job.uuid,
+      runnerToken,
+      payload: successBody
+    })
+  } finally {
+    await remove(audioPath)
+    await remove(inputPath)
+    await remove(outputPath)
+  }
 }