forks/peertube
1
0
Fork 0
Code Releases Activity

Don't send an error on live abort

Browse source
This commit is contained in:
Chocobozzz 2023-05-23 08:31:02 +02:00
parent d8fe90dde2
commit d4d0f3ba0e
No known key found for this signature in database
GPG key ID: 583A612D890159BE
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packages/peertube-runner/server/process/shared/process-live.ts
View file

@ -77,7 +77,7 @@ export class ProcessLiveRTMPHLSTranscoding {
try { try {
await this.sendPendingChunks() await this.sendPendingChunks()
} catch (err) { } catch (err) {
this.onUpdateError(err, rej) this.onUpdateError({ err, rej, res })
} }
const playlistName = this.getPlaylistIdFromTS(p) const playlistName = this.getPlaylistIdFromTS(p)
@ -90,7 +90,7 @@ export class ProcessLiveRTMPHLSTranscoding {
tsWatcher.on('unlink', p => { tsWatcher.on('unlink', p => {
this.sendDeletedChunkUpdate(p) this.sendDeletedChunkUpdate(p)
.catch(err => this.onUpdateError(err, rej)) .catch(err => this.onUpdateError({ err, rej, res }))
}) })
this.ffmpegCommand = await buildFFmpegLive().getLiveTranscodingCommand({ this.ffmpegCommand = await buildFFmpegLive().getLiveTranscodingCommand({
@ -134,23 +134,32 @@ export class ProcessLiveRTMPHLSTranscoding {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
private onUpdateError (err: Error, reject: (reason?: any) => void) { private onUpdateError (options: {
err: Error
res: () => void
rej: (reason?: any) => void
}) {
const { err, res, rej } = options
if (this.errored) return if (this.errored) return
if (this.ended) return if (this.ended) return
this.errored = true this.errored = true
reject(err)
this.ffmpegCommand.kill('SIGINT') this.ffmpegCommand.kill('SIGINT')
const type = ((err as any).res?.body as PeerTubeProblemDocument)?.code const type = ((err as any).res?.body as PeerTubeProblemDocument)?.code
if (type === ServerErrorCode.RUNNER_JOB_NOT_IN_PROCESSING_STATE) { if (type === ServerErrorCode.RUNNER_JOB_NOT_IN_PROCESSING_STATE) {
logger.info({ err }, 'Stopping transcoding as the job is not in processing state anymore') logger.info({ err }, 'Stopping transcoding as the job is not in processing state anymore')
res()
} else { } else {
logger.error({ err }, 'Cannot send update after added/deleted chunk, stopping live transcoding') logger.error({ err }, 'Cannot send update after added/deleted chunk, stopping live transcoding')
this.sendError(err) this.sendError(err)
.catch(subErr => logger.error({ err: subErr }, 'Cannot send error')) .catch(subErr => logger.error({ err: subErr }, 'Cannot send error'))
rej(err)
} }
this.cleanup() this.cleanup()