aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/live
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-05-19 09:23:20 +0200
committerChocobozzz <me@florianbigard.com>2023-05-19 09:23:20 +0200
commitfe7019b2323768f7e33890303f95c9a45688ac1d (patch)
tree8ccd4aa71d36626d1bffb1e2a8537241e2002404 /server/lib/live
parentef2e6aabf755feeec96011e70ff2522a491c5cb3 (diff)
downloadPeerTube-fe7019b2323768f7e33890303f95c9a45688ac1d.tar.gz
PeerTube-fe7019b2323768f7e33890303f95c9a45688ac1d.tar.zst
PeerTube-fe7019b2323768f7e33890303f95c9a45688ac1d.zip
Fix peertube runner concurrency
Diffstat (limited to 'server/lib/live')
-rw-r--r--server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts4
1 files changed, 4 insertions, 0 deletions
diff --git a/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts b/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts
index 3c2cf51b7..5bad34860 100644
--- a/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts
+++ b/server/lib/live/shared/transcoding-wrapper/ffmpeg-transcoding-wrapper.ts
@@ -68,6 +68,8 @@ export class FFmpegTranscodingWrapper extends AbstractTranscodingWrapper {
68 abort () { 68 abort () {
69 if (this.ended || this.errored || this.aborted) return 69 if (this.ended || this.errored || this.aborted) return
70 70
71 logger.debug('Killing ffmpeg after live abort of ' + this.videoUUID, this.lTags())
72
71 this.ffmpegCommand.kill('SIGINT') 73 this.ffmpegCommand.kill('SIGINT')
72 74
73 this.aborted = true 75 this.aborted = true
@@ -95,6 +97,8 @@ export class FFmpegTranscodingWrapper extends AbstractTranscodingWrapper {
95 private onFFmpegEnded () { 97 private onFFmpegEnded () {
96 if (this.ended || this.errored || this.aborted) return 98 if (this.ended || this.errored || this.aborted) return
97 99
100 logger.debug('Live ffmpeg transcoding ended for ' + this.videoUUID, this.lTags())
101
98 this.ended = true 102 this.ended = true
99 this.emit('end') 103 this.emit('end')
100 } 104 }