2 files changed, 16 insertions, 2 deletions

diff --git a/server/lib/job-queue/handlers/video-transcoding.ts b/server/lib/job-queue/handlers/video-transcoding.ts
index 20880cdc1..b280a1cc9 100644
--- a/server/lib/job-queue/handlers/video-transcoding.ts
+++ b/server/lib/job-queue/handlers/video-transcoding.ts
@@ -2,7 +2,7 @@ import { Job } from 'bull'
 import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
 import { addTranscodingJob, getTranscodingJobPriority } from '@server/lib/video'
 import { VideoPathManager } from '@server/lib/video-path-manager'
-import { moveToNextState } from '@server/lib/video-state'
+import { moveToFailedState, moveToNextState } from '@server/lib/video-state'
 import { UserModel } from '@server/models/user/user'
 import { VideoJobInfoModel } from '@server/models/video/video-job-info'
 import { MUser, MUserId, MVideo, MVideoFullLight, MVideoWithFile } from '@server/types/models'
@@ -52,10 +52,17 @@ async function processVideoTranscoding (job: Job) {
   const handler = handlers[payload.type]
 
   if (!handler) {
+    await moveToFailedState(video)
     throw new Error('Cannot find transcoding handler for ' + payload.type)
   }
 
-  await handler(job, payload, video, user)
+  try {
+    await handler(job, payload, video, user)
+  } catch (error) {
+    await moveToFailedState(video)
+
+    throw error
+  }
 
   return video
 }
diff --git a/server/lib/video-state.ts b/server/lib/video-state.ts
index d5bbbec43..2260e90f5 100644
--- a/server/lib/video-state.ts
+++ b/server/lib/video-state.ts
@@ -79,11 +79,18 @@ async function moveToExternalStorageState (video: MVideoFullLight, isNewVideo: b
   }
 }
 
+function moveToFailedState (video: MVideoFullLight) {
+  return sequelizeTypescript.transaction(async t => {
+    await video.setNewState(VideoState.TRANSCODING_FAILED, false, t)
+  })
+}
+
 // ---------------------------------------------------------------------------
 
 export {
   buildNextVideoState,
   moveToExternalStorageState,
+  moveToFailedState,
   moveToNextState
 }