From 293992563943e6791a798f4f5b31f04773684ed7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 13 Jul 2022 15:37:36 +0200 Subject: Fix live tests --- server/lib/live/shared/muxing-session.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'server') diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts index 036d9d142..55d070c96 100644 --- a/server/lib/live/shared/muxing-session.ts +++ b/server/lib/live/shared/muxing-session.ts @@ -249,8 +249,6 @@ class MuxingSession extends EventEmitter { const playlistIdMatcher = /^([\d+])-/ const addHandler = async (segmentPath: string) => { - if (this.aborted) return - logger.debug('Live add handler of %s.', segmentPath, this.lTags()) const playlistId = basename(segmentPath).match(playlistIdMatcher)[0] @@ -285,6 +283,7 @@ class MuxingSession extends EventEmitter { private async isQuotaExceeded (segmentPath: string) { if (this.saveReplay !== true) return false + if (this.aborted) return false try { const segmentStat = await stat(segmentPath) @@ -337,8 +336,6 @@ class MuxingSession extends EventEmitter { } private processSegments (segmentPaths: string[]) { - if (this.aborted) return - mapSeries(segmentPaths, async previousSegment => { // Add sha hash of previous segments, because ffmpeg should have finished generating them await LiveSegmentShaStore.Instance.addSegmentSha(this.videoUUID, previousSegment) @@ -346,7 +343,11 @@ class MuxingSession extends EventEmitter { if (this.saveReplay) { 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) { -- cgit v1.2.3