OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix live saving after a server restart

pull/3385/head
Chocobozzz 2020-11-30 17:03:13 +01:00
parent a742b4b0e2
commit 8c666c44ab
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/lib/job-queue/handlers/video-live-ending.ts
View File

@ -1,8 +1,9 @@
import * as Bull from 'bull' import * as Bull from 'bull'
import { move, readdir, remove } from 'fs-extra' import { copy, readdir, remove } from 'fs-extra'
import { join } from 'path' import { join } from 'path'
import { hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils' import { hlsPlaylistToFragmentedMP4 } from '@server/helpers/ffmpeg-utils'
import { getDurationFromVideoFile, getVideoFileResolution } from '@server/helpers/ffprobe-utils' import { getDurationFromVideoFile, getVideoFileResolution } from '@server/helpers/ffprobe-utils'
import { VIDEO_LIVE } from '@server/initializers/constants'
import { generateVideoMiniature } from '@server/lib/thumbnail' import { generateVideoMiniature } from '@server/lib/thumbnail'
import { publishAndFederateIfNeeded } from '@server/lib/video' import { publishAndFederateIfNeeded } from '@server/lib/video'
import { getHLSDirectory } from '@server/lib/video-paths' import { getHLSDirectory } from '@server/lib/video-paths'
@ -14,7 +15,6 @@ import { VideoStreamingPlaylistModel } from '@server/models/video/video-streamin
import { MStreamingPlaylist, MVideo, MVideoLive } from '@server/types/models' import { MStreamingPlaylist, MVideo, MVideoLive } from '@server/types/models'
import { ThumbnailType, VideoLiveEndingPayload, VideoState } from '@shared/models' import { ThumbnailType, VideoLiveEndingPayload, VideoState } from '@shared/models'
import { logger } from '../../../helpers/logger' import { logger } from '../../../helpers/logger'
import { VIDEO_LIVE } from '@server/initializers/constants'
async function processVideoLiveEnding (job: Bull.Job) { async function processVideoLiveEnding (job: Bull.Job) {
const payload = job.data as VideoLiveEndingPayload const payload = job.data as VideoLiveEndingPayload
@ -61,11 +61,12 @@ async function saveLive (video: MVideo, live: MVideoLive) {
const playlistFiles: string[] = [] const playlistFiles: string[] = []
for (const file of rootFiles) { for (const file of rootFiles) {
if (file.endsWith('.m3u8') !== true) continue // Move remaining files in the replay directory
if (file.endsWith('.ts') || file.endsWith('.m3u8')) {
await copy(join(hlsDirectory, file), join(replayDirectory, file))
}
await move(join(hlsDirectory, file), join(replayDirectory, file)) if (file.endsWith('.m3u8') && file !== 'master.m3u8') {
if (file !== 'master.m3u8') {
playlistFiles.push(file) playlistFiles.push(file)
} }
} }

14
server/lib/live-manager.ts
View File

@ -378,13 +378,13 @@ class LiveManager {
// Wait latest segments generation, and close watchers // Wait latest segments generation, and close watchers
Promise.all([ tsWatcher.close(), masterWatcher.close() ]) Promise.all([ tsWatcher.close(), masterWatcher.close() ])
.then(() => { .then(() => {
// Process remaining segments hash // Process remaining segments hash
for (const key of Object.keys(segmentsToProcessPerPlaylist)) { for (const key of Object.keys(segmentsToProcessPerPlaylist)) {
processSegments(segmentsToProcessPerPlaylist[key]) processSegments(segmentsToProcessPerPlaylist[key])
} }
}) })
.catch(err => logger.error('Cannot close watchers of %s or process remaining hash segments.', outPath, { err })) .catch(err => logger.error('Cannot close watchers of %s or process remaining hash segments.', outPath, { err }))
this.onEndTransmuxing(videoLive.Video.id) this.onEndTransmuxing(videoLive.Video.id)
.catch(err => logger.error('Error in closed transmuxing.', { err })) .catch(err => logger.error('Error in closed transmuxing.', { err }))