diff options
author | Chocobozzz <me@florianbigard.com> | 2023-05-04 15:29:34 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2023-05-09 08:57:34 +0200 |
commit | 5e47f6ab984a7d00782e4c7030afffa1ba480add (patch) | |
tree | 1ce586b591a8d71acbc301eba29b9a5e6490439e /server/lib/runners/job-handlers/abstract-job-handler.ts | |
parent | 6a4905602636afd6650c9e6f4d0fcc2105d91100 (diff) | |
download | PeerTube-5e47f6ab984a7d00782e4c7030afffa1ba480add.tar.gz PeerTube-5e47f6ab984a7d00782e4c7030afffa1ba480add.tar.zst PeerTube-5e47f6ab984a7d00782e4c7030afffa1ba480add.zip |
Support studio transcoding in peertube runner
Diffstat (limited to 'server/lib/runners/job-handlers/abstract-job-handler.ts')
-rw-r--r-- | server/lib/runners/job-handlers/abstract-job-handler.ts | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/server/lib/runners/job-handlers/abstract-job-handler.ts b/server/lib/runners/job-handlers/abstract-job-handler.ts index 74b455107..76fd1c5ac 100644 --- a/server/lib/runners/job-handlers/abstract-job-handler.ts +++ b/server/lib/runners/job-handlers/abstract-job-handler.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | import { throttle } from 'lodash' | ||
1 | import { retryTransactionWrapper } from '@server/helpers/database-utils' | 2 | import { retryTransactionWrapper } from '@server/helpers/database-utils' |
2 | import { logger, loggerTagsFactory } from '@server/helpers/logger' | 3 | import { logger, loggerTagsFactory } from '@server/helpers/logger' |
3 | import { RUNNER_JOBS } from '@server/initializers/constants' | 4 | import { RUNNER_JOBS } from '@server/initializers/constants' |
@@ -14,6 +15,8 @@ import { | |||
14 | RunnerJobSuccessPayload, | 15 | RunnerJobSuccessPayload, |
15 | RunnerJobType, | 16 | RunnerJobType, |
16 | RunnerJobUpdatePayload, | 17 | RunnerJobUpdatePayload, |
18 | RunnerJobVideoEditionTranscodingPayload, | ||
19 | RunnerJobVideoEditionTranscodingPrivatePayload, | ||
17 | RunnerJobVODAudioMergeTranscodingPayload, | 20 | RunnerJobVODAudioMergeTranscodingPayload, |
18 | RunnerJobVODAudioMergeTranscodingPrivatePayload, | 21 | RunnerJobVODAudioMergeTranscodingPrivatePayload, |
19 | RunnerJobVODHLSTranscodingPayload, | 22 | RunnerJobVODHLSTranscodingPayload, |
@@ -21,7 +24,6 @@ import { | |||
21 | RunnerJobVODWebVideoTranscodingPayload, | 24 | RunnerJobVODWebVideoTranscodingPayload, |
22 | RunnerJobVODWebVideoTranscodingPrivatePayload | 25 | RunnerJobVODWebVideoTranscodingPrivatePayload |
23 | } from '@shared/models' | 26 | } from '@shared/models' |
24 | import { throttle } from 'lodash' | ||
25 | 27 | ||
26 | type CreateRunnerJobArg = | 28 | type CreateRunnerJobArg = |
27 | { | 29 | { |
@@ -43,6 +45,11 @@ type CreateRunnerJobArg = | |||
43 | type: Extract<RunnerJobType, 'live-rtmp-hls-transcoding'> | 45 | type: Extract<RunnerJobType, 'live-rtmp-hls-transcoding'> |
44 | payload: RunnerJobLiveRTMPHLSTranscodingPayload | 46 | payload: RunnerJobLiveRTMPHLSTranscodingPayload |
45 | privatePayload: RunnerJobLiveRTMPHLSTranscodingPrivatePayload | 47 | privatePayload: RunnerJobLiveRTMPHLSTranscodingPrivatePayload |
48 | } | | ||
49 | { | ||
50 | type: Extract<RunnerJobType, 'video-edition-transcoding'> | ||
51 | payload: RunnerJobVideoEditionTranscodingPayload | ||
52 | privatePayload: RunnerJobVideoEditionTranscodingPrivatePayload | ||
46 | } | 53 | } |
47 | 54 | ||
48 | export abstract class AbstractJobHandler <C, U extends RunnerJobUpdatePayload, S extends RunnerJobSuccessPayload> { | 55 | export abstract class AbstractJobHandler <C, U extends RunnerJobUpdatePayload, S extends RunnerJobSuccessPayload> { |
@@ -62,6 +69,8 @@ export abstract class AbstractJobHandler <C, U extends RunnerJobUpdatePayload, S | |||
62 | }): Promise<MRunnerJob> { | 69 | }): Promise<MRunnerJob> { |
63 | const { priority, dependsOnRunnerJob } = options | 70 | const { priority, dependsOnRunnerJob } = options |
64 | 71 | ||
72 | logger.debug('Creating runner job', { options, ...this.lTags(options.type) }) | ||
73 | |||
65 | const runnerJob = new RunnerJobModel({ | 74 | const runnerJob = new RunnerJobModel({ |
66 | ...pick(options, [ 'type', 'payload', 'privatePayload' ]), | 75 | ...pick(options, [ 'type', 'payload', 'privatePayload' ]), |
67 | 76 | ||