forks/peertube
1
0
Fork 0
Code Releases Activity

Fix live tests

Browse source
This commit is contained in:
Chocobozzz 2022-07-13 15:37:36 +02:00
parent ba2684cedd
commit 2939925639
No known key found for this signature in database
GPG key ID: 583A612D890159BE
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/lib/live/shared/muxing-session.ts
View file

@ -249,8 +249,6 @@ class MuxingSession extends EventEmitter {
const playlistIdMatcher = /^([\d+])-/ const playlistIdMatcher = /^([\d+])-/
const addHandler = async (segmentPath: string) => { const addHandler = async (segmentPath: string) => {
if (this.aborted) return
logger.debug('Live add handler of %s.', segmentPath, this.lTags()) logger.debug('Live add handler of %s.', segmentPath, this.lTags())
const playlistId = basename(segmentPath).match(playlistIdMatcher)[0] const playlistId = basename(segmentPath).match(playlistIdMatcher)[0]
@ -285,6 +283,7 @@ class MuxingSession extends EventEmitter {
private async isQuotaExceeded (segmentPath: string) { private async isQuotaExceeded (segmentPath: string) {
if (this.saveReplay !== true) return false if (this.saveReplay !== true) return false
if (this.aborted) return false
try { try {
const segmentStat = await stat(segmentPath) const segmentStat = await stat(segmentPath)
@ -337,8 +336,6 @@ class MuxingSession extends EventEmitter {
} }
private processSegments (segmentPaths: string[]) { private processSegments (segmentPaths: string[]) {
if (this.aborted) return
mapSeries(segmentPaths, async previousSegment => { mapSeries(segmentPaths, async previousSegment => {
// Add sha hash of previous segments, because ffmpeg should have finished generating them // Add sha hash of previous segments, because ffmpeg should have finished generating them
await LiveSegmentShaStore.Instance.addSegmentSha(this.videoUUID, previousSegment) await LiveSegmentShaStore.Instance.addSegmentSha(this.videoUUID, previousSegment)
@ -346,7 +343,11 @@ class MuxingSession extends EventEmitter {
if (this.saveReplay) { if (this.saveReplay) {
await this.addSegmentToReplay(previousSegment) await this.addSegmentToReplay(previousSegment)
} }
}).catch(err => logger.error('Cannot process segments', { err, ...this.lTags() })) }).catch(err => {
if (this.aborted) return
logger.error('Cannot process segments', { err, ...this.lTags() })
})
} }
private hasClientSocketInBadHealth (sessionId: string) { private hasClientSocketInBadHealth (sessionId: string) {