yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 18:29:27 +02:00
Code Issues Releases Wiki Activity

Prevent aborting another live session

Browse source
This commit is contained in:
Chocobozzz 2024-03-18 16:09:22 +01:00
parent 3b429f2104
commit c727a34cb6
No known key found for this signature in database
GPG key ID: 583A612D890159BE
6 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/core/lib/runners/job-handlers/live-rtmp-hls-transcoding-job-handler.ts
View file

@ -7,6 +7,7 @@ import {
RunnerJobStateType
} from '@peertube/peertube-models'
import { buildUUID } from '@peertube/peertube-node-utils'
import { tryAtomicMove } from '@server/helpers/fs.js'
import { logger } from '@server/helpers/logger.js'
import { JOB_PRIORITY } from '@server/initializers/constants.js'
import { LiveManager } from '@server/lib/live/index.js'
@ -15,7 +16,6 @@ import { MRunnerJob } from '@server/types/models/runners/index.js'
import { remove } from 'fs-extra/esm'
import { join } from 'path'
import { AbstractJobHandler } from './abstract-job-handler.js'
import { tryAtomicMove } from '@server/helpers/fs.js'
type CreateOptions = {
video: MVideo
@ -165,7 +165,11 @@ export class LiveRTMPHLSTranscodingJobHandler extends AbstractJobHandler<CreateO
cancelled: LiveVideoError.RUNNER_JOB_CANCEL
}
LiveManager.Instance.stopSessionOf({ videoUUID: privatePayload.videoUUID, error: errorType[type] })
LiveManager.Instance.stopSessionOfVideo({
videoUUID: privatePayload.videoUUID,
expectedSessionId: privatePayload.sessionId,
error: errorType[type]
})
logger.info('Runner live RTMP to HLS job %s for video %s %s.', runnerJob.uuid, videoUUID, type, this.lTags(runnerJob.uuid, videoUUID))
}