diff options
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/checker-before-init.ts | 2 | ||||
-rw-r--r-- | server/initializers/config.ts | 5 | ||||
-rw-r--r-- | server/initializers/constants.ts | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 2361aa1eb..2f5a274e4 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts | |||
@@ -38,7 +38,7 @@ function checkMissedConfig () { | |||
38 | 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', | 38 | 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', |
39 | 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', | 39 | 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', |
40 | 'transcoding.resolutions.2160p', 'transcoding.always_transcode_original_resolution', 'transcoding.remote_runners.enabled', | 40 | 'transcoding.resolutions.2160p', 'transcoding.always_transcode_original_resolution', 'transcoding.remote_runners.enabled', |
41 | 'video_studio.enabled', | 41 | 'video_studio.enabled', 'video_studio.remote_runners.enabled', |
42 | 'remote_runners.stalled_jobs.vod', 'remote_runners.stalled_jobs.live', | 42 | 'remote_runners.stalled_jobs.vod', 'remote_runners.stalled_jobs.live', |
43 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'import.videos.timeout', | 43 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'import.videos.timeout', |
44 | 'import.video_channel_synchronization.enabled', 'import.video_channel_synchronization.max_per_user', | 44 | 'import.video_channel_synchronization.enabled', 'import.video_channel_synchronization.max_per_user', |
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index f2d8f99b5..9c2705689 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
@@ -423,7 +423,10 @@ const CONFIG = { | |||
423 | } | 423 | } |
424 | }, | 424 | }, |
425 | VIDEO_STUDIO: { | 425 | VIDEO_STUDIO: { |
426 | get ENABLED () { return config.get<boolean>('video_studio.enabled') } | 426 | get ENABLED () { return config.get<boolean>('video_studio.enabled') }, |
427 | REMOTE_RUNNERS: { | ||
428 | get ENABLED () { return config.get<boolean>('video_studio.remote_runners.enabled') } | ||
429 | } | ||
427 | }, | 430 | }, |
428 | IMPORT: { | 431 | IMPORT: { |
429 | VIDEOS: { | 432 | VIDEOS: { |
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 279e77421..6a757a0ff 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -229,7 +229,8 @@ const REPEAT_JOBS: { [ id in JobType ]?: RepeatOptions } = { | |||
229 | } | 229 | } |
230 | } | 230 | } |
231 | const JOB_PRIORITY = { | 231 | const JOB_PRIORITY = { |
232 | TRANSCODING: 100 | 232 | TRANSCODING: 100, |
233 | VIDEO_STUDIO: 150 | ||
233 | } | 234 | } |
234 | 235 | ||
235 | const JOB_REMOVAL_OPTIONS = { | 236 | const JOB_REMOVAL_OPTIONS = { |