X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker-after-init.ts;h=e542a539556368ffbab5a84d6599ceea886777c3;hb=9452d4fd3321148fb80b64a67bd9983fee6c208e;hp=635a32010b66dab45b1130daabff4e5ff0ada095;hpb=c729caf6cc34630877a0e5a1bda1719384cd0c8a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts
index 635a32010..e542a5395 100644
--- a/server/initializers/checker-after-init.ts
+++ b/server/initializers/checker-after-init.ts
@@ -4,7 +4,7 @@ import { URL } from 'url'
 import { getFFmpegVersion } from '@server/helpers/ffmpeg'
 import { VideoRedundancyConfigFilter } from '@shared/models/redundancy/video-redundancy-config-filter.type'
 import { RecentlyAddedStrategy } from '../../shared/models/redundancy'
-import { isProdInstance, isTestInstance, parseSemVersion } from '../helpers/core-utils'
+import { isProdInstance, parseSemVersion } from '../helpers/core-utils'
 import { isArray } from '../helpers/custom-validators/misc'
 import { logger } from '../helpers/logger'
 import { ApplicationModel, getServerActor } from '../models/application/application'
@@ -34,6 +34,9 @@ async function checkActivityPubUrls () {
 // Some checks on configuration files or throw if there is an error
 function checkConfig () {
 
+  const configFiles = config.util.getConfigSources().map(s => s.name).join(' -> ')
+  logger.info('Using following configuration file hierarchy: %s.', configFiles)
+
   // Moved configuration keys
   if (config.has('services.csp-logger')) {
     logger.warn('services.csp-logger configuration has been renamed to csp.report_uri. Please update your configuration file.')
@@ -49,7 +52,7 @@ function checkConfig () {
   checkSearchConfig()
   checkLiveConfig()
   checkObjectStorageConfig()
-  checkVideoEditorConfig()
+  checkVideoStudioConfig()
 }
 
 // We get db by param to not import it in this file (import orders)
@@ -128,7 +131,7 @@ function checkLocalRedundancyConfig () {
       }
 
       // Lifetime should not be < 10 hours
-      if (!isTestInstance() && r.minLifetime < 1000 * 3600 * 10) {
+      if (isProdInstance() && r.minLifetime < 1000 * 3600 * 10) {
         throw new Error('Video redundancy minimum lifetime should be >= 10 hours for strategy ' + r.strategy)
       }
     }
@@ -260,8 +263,8 @@ function checkObjectStorageConfig () {
   }
 }
 
-function checkVideoEditorConfig () {
-  if (CONFIG.VIDEO_EDITOR.ENABLED === true && CONFIG.TRANSCODING.ENABLED === false) {
-    throw new Error('Video editor cannot be enabled if transcoding is disabled')
+function checkVideoStudioConfig () {
+  if (CONFIG.VIDEO_STUDIO.ENABLED === true && CONFIG.TRANSCODING.ENABLED === false) {
+    throw new Error('Video studio cannot be enabled if transcoding is disabled')
   }
 }