IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't cancel finished jobs

Browse Source
This commit is contained in:
Chocobozzz 2024-03-19 08:37:50 +01:00
parent c727a34cb6
commit 0301d77254
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/lib/live/live-manager.ts
View File

@ -523,7 +523,7 @@ class LiveManager {
} }
private async handleBrokenLives () { private async handleBrokenLives () {
await RunnerJobModel.cancelAllJobs({ type: 'live-rtmp-hls-transcoding' }) await RunnerJobModel.cancelAllNonFinishedJobs({ type: 'live-rtmp-hls-transcoding' })
const videoUUIDs = await VideoModel.listPublishedLiveUUIDs() const videoUUIDs = await VideoModel.listPublishedLiveUUIDs()

7
server/core/models/runner/runner-job.ts
View File

@ -278,9 +278,12 @@ export class RunnerJobModel extends SequelizeModel<RunnerJobModel> {
return RunnerJobModel.update({ state: RunnerJobState.PENDING }, { where }) return RunnerJobModel.update({ state: RunnerJobState.PENDING }, { where })
} }
static cancelAllJobs (options: { type: RunnerJobType }) { static cancelAllNonFinishedJobs (options: { type: RunnerJobType }) {
const where = { const where = {
type: options.type type: options.type,
state: {
[Op.in]: [ RunnerJobState.COMPLETING, RunnerJobState.PENDING, RunnerJobState.PROCESSING, RunnerJobState.WAITING_FOR_PARENT_JOB ]
}
} }
return RunnerJobModel.update({ state: RunnerJobState.CANCELLED }, { where }) return RunnerJobModel.update({ state: RunnerJobState.CANCELLED }, { where })