Skip to content

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

More robust live ending handler

Chocobozzzcbda8151f964
diff --git a/server/core/lib/job-queue/handlers/video-live-ending.ts b/server/core/lib/job-queue/handlers/video-live-ending.ts
index e9287f5d9f..dcb06a9f29 100644
--- a/server/core/lib/job-queue/handlers/video-live-ending.ts
+++ b/server/core/lib/job-queue/handlers/video-live-ending.ts
@@ -78,6 +78,12 @@ export async function processVideoLiveEnding (job: Job) {
let replayDirectory = payload.replayDirectory
+ if (!replayDirectory) {
+ logger.info(`No replay directory found for live ${video.uuid}, skipping video replay creation.`, { ...lTags(video.uuid) })
+
+ return cleanupLiveAndFederate({ permanentLive, video, streamingPlaylistId: payload.streamingPlaylistId })
+ }
+
// Introduced in PeerTube 7.2, allow to use the appropriate base directory even if the live privacy changed
if (!isAbsolute(replayDirectory)) {
replayDirectory = join(getLiveReplayBaseDirectory(video), replayDirectory)
diff --git a/server/core/lib/live/live-manager.ts b/server/core/lib/live/live-manager.ts
index c19fc45cb6..36519d84cc 100644
--- a/server/core/lib/live/live-manager.ts
+++ b/server/core/lib/live/live-manager.ts
@@ -22,6 +22,7 @@ import { VideoStreamingPlaylistModel } from '@server/models/video/video-streamin
import { VideoModel } from '@server/models/video/video.js'
import { MUser, MVideo, MVideoLiveSession, MVideoLiveVideo, MVideoLiveVideoWithSetting } from '@server/types/models/index.js'
import { FfprobeData } from 'fluent-ffmpeg'
+import { pathExists } from 'fs-extra/esm'
import { readFile, readdir } from 'fs/promises'
import { Server, createServer } from 'net'
import context from 'node-media-server/src/node_core_ctx.js'
@@ -626,6 +627,8 @@ class LiveManager {
private async findReplayDirectory (video: MVideo) {
const directory = getLiveReplayBaseDirectory(video)
+ if (!(await pathExists(directory))) return undefined
+
const files = await readdir(directory)
if (files.length === 0) return undefined