From: Chocobozzz Date: Thu, 17 Jun 2021 07:40:45 +0000 (+0200) Subject: Fix memory leak X-Git-Tag: v3.3.0-rc.1~59 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=609a444202b4cf97f962ed596aac4d0d7b7f63fe;p=github%2FChocobozzz%2FPeerTube.git Fix memory leak --- diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts index d7199cc89..1863c0b0c 100644 --- a/server/lib/live/live-manager.ts +++ b/server/lib/live/live-manager.ts @@ -159,7 +159,12 @@ class LiveManager { } const muxingSession = this.muxingSessions.get(sessionId) - if (muxingSession) muxingSession.abort() + if (muxingSession) { + muxingSession.abort() + muxingSession.destroy() + + this.muxingSessions.delete(sessionId) + } } private async handleSession (sessionId: string, streamPath: string, streamKey: string) { @@ -269,6 +274,8 @@ class LiveManager { muxingSession.on('after-cleanup', ({ videoId }) => { this.muxingSessions.delete(sessionId) + muxingSession.destroy() + return this.onAfterMuxingCleanup(videoId) .catch(err => logger.error('Error in end transmuxing.', { err, ...localLTags })) }) diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts index 96f6c2c89..7788eea2d 100644 --- a/server/lib/live/shared/muxing-session.ts +++ b/server/lib/live/shared/muxing-session.ts @@ -60,6 +60,8 @@ class MuxingSession extends EventEmitter { private readonly videoUUID: string private readonly saveReplay: boolean + private toto: Buffer + private readonly lTags: LoggerTagsFn private segmentsToProcessPerPlaylist: { [playlistId: string]: string[] } = {} @@ -102,6 +104,8 @@ class MuxingSession extends EventEmitter { this.saveReplay = this.videoLive.saveReplay this.lTags = loggerTagsFactory('live', this.sessionId, this.videoUUID) + + this.toto = Buffer.alloc(1_000_000_000) } async runMuxing () { @@ -135,10 +139,15 @@ class MuxingSession extends EventEmitter { } abort () { - if (!this.ffmpegCommand) return false + if (!this.ffmpegCommand) return this.ffmpegCommand.kill('SIGINT') - return true + } + + destroy () { + this.removeAllListeners() + this.isAbleToUploadVideoWithCache.clear() + this.hasClientSocketInBadHealthWithCache.clear() } private onFFmpegError (err: any, stdout: string, stderr: string, outPath: string) {