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

Fix live ending

This commit is contained in:
Chocobozzz 2020-10-29 14:19:38 +01:00 committed by Chocobozzz
parent a056ca4813
commit 284ef52911
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class LiveManager {
}) })
events.on('donePublish', sessionId => { events.on('donePublish', sessionId => {
this.abortSession(sessionId) logger.info('Live session ended.', { sessionId })
}) })
this.segmentsSha256Queue = queue<SegmentSha256QueueParam, Error>((options, cb) => { this.segmentsSha256Queue = queue<SegmentSha256QueueParam, Error>((options, cb) => {
@ -145,10 +145,16 @@ class LiveManager {
private abortSession (id: string) { private abortSession (id: string) {
const session = this.getContext().sessions.get(id) const session = this.getContext().sessions.get(id)
if (session) session.stop() if (session) {
session.stop()
this.getContext().sessions.delete(id)
}
const transSession = this.transSessions.get(id) const transSession = this.transSessions.get(id)
if (transSession) transSession.kill('SIGKILL') if (transSession) {
transSession.kill('SIGINT')
this.transSessions.delete(id)
}
} }
private async handleSession (sessionId: string, streamPath: string, streamKey: string) { private async handleSession (sessionId: string, streamPath: string, streamKey: string) {
@ -300,6 +306,8 @@ class LiveManager {
const onFFmpegEnded = () => { const onFFmpegEnded = () => {
logger.info('RTMP transmuxing for video %s ended. Scheduling cleanup', streamPath) logger.info('RTMP transmuxing for video %s ended. Scheduling cleanup', streamPath)
this.transSessions.delete(sessionId)
Promise.all([ tsWatcher.close(), masterWatcher.close() ]) Promise.all([ tsWatcher.close(), masterWatcher.close() ])
.catch(err => logger.error('Cannot close watchers of %s.', outPath, { err })) .catch(err => logger.error('Cannot close watchers of %s.', outPath, { err }))
@ -311,7 +319,7 @@ class LiveManager {
onFFmpegEnded() onFFmpegEnded()
// Don't care that we killed the ffmpeg process // Don't care that we killed the ffmpeg process
if (err?.message?.includes('SIGKILL')) return if (err?.message?.includes('SIGINT')) return
logger.error('Live transcoding error.', { err, stdout, stderr }) logger.error('Live transcoding error.', { err, stdout, stderr })
}) })