Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

More robust move video on failure

Chocobozzz7e52aeaddc23
diff --git a/server/core/lib/job-queue/handlers/move-to-file-system.ts b/server/core/lib/job-queue/handlers/move-to-file-system.ts
index f5d07b0a2b..22170194e8 100644
--- a/server/core/lib/job-queue/handlers/move-to-file-system.ts
+++ b/server/core/lib/job-queue/handlers/move-to-file-system.ts
@@ -42,8 +42,7 @@ export async function processMoveToFileSystem (job: Job) {
moveVideoSourceFile,
moveCaptionFiles,
- doAfterLastMove: video => doAfterLastMove({ video, previousVideoState: payload.previousVideoState, isNewVideo: payload.isNewVideo }),
- moveToFailedState: moveToFailedMoveToFileSystemState
+ doAfterLastMove: video => doAfterLastMove({ video, previousVideoState: payload.previousVideoState, isNewVideo: payload.isNewVideo })
})
} else if (isMoveCaptionPayload(payload)) { // Only caption file
logger.info(`Moving video caption ${payload.captionId} to file system in job ${job.id}.`)
diff --git a/server/core/lib/job-queue/handlers/move-to-object-storage.ts b/server/core/lib/job-queue/handlers/move-to-object-storage.ts
index 70a25b5dc4..0ac890a972 100644
--- a/server/core/lib/job-queue/handlers/move-to-object-storage.ts
+++ b/server/core/lib/job-queue/handlers/move-to-object-storage.ts
@@ -43,9 +43,7 @@ export async function processMoveToObjectStorage (job: Job) {
doAfterLastMove: video => {
return doAfterLastVideoMove({ video, previousVideoState: payload.previousVideoState, isNewVideo: payload.isNewVideo })
- },
-
- moveToFailedState: moveToFailedMoveToObjectStorageState
+ }
})
} else if (isMoveCaptionPayload(payload)) { // Only caption file
logger.info(`Moving video caption ${payload.captionId} to object storage in job ${job.id}.`, lTagsBase(payload.captionId))
diff --git a/server/core/lib/job-queue/handlers/shared/move-video.ts b/server/core/lib/job-queue/handlers/shared/move-video.ts
index 01a1d81624..e0bdb1b2d3 100644
--- a/server/core/lib/job-queue/handlers/shared/move-video.ts
+++ b/server/core/lib/job-queue/handlers/shared/move-video.ts
@@ -17,7 +17,6 @@ export async function moveVideoToStorageJob (options: {
moveVideoSourceFile: (source: MVideoSource) => Promise<void>
moveCaptionFiles: (captions: MVideoCaption[], hls: MStreamingPlaylistVideoUUID) => Promise<void>
- moveToFailedState: (video: MVideoWithAllFiles) => Promise<void>
doAfterLastMove: (video: MVideoWithAllFiles) => Promise<void>
}) {
const {
@@ -28,7 +27,6 @@ export async function moveVideoToStorageJob (options: {
moveHLSFiles,
moveWebVideoFiles,
moveCaptionFiles,
- moveToFailedState,
doAfterLastMove
} = options
@@ -83,11 +81,7 @@ export async function moveVideoToStorageJob (options: {
await doAfterLastMove(video)
}
- } catch (err) {
- await onMoveVideoToStorageFailure({ videoUUID, err, lTags, moveToFailedState })
-
- throw err
- } finally {
+ } finally { // Error handling is managed by the job queue
fileMutexReleaser()
}
}