3 files changed, 52 insertions, 44 deletions

diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts
index f65798c42..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.')
@@ -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)
       }
     }
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index e3683269c..009f878fc 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -19,7 +19,7 @@ import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type'
 import { VideoPlaylistPrivacy } from '../../shared/models/videos/playlist/video-playlist-privacy.model'
 import { VideoPlaylistType } from '../../shared/models/videos/playlist/video-playlist-type.model'
 // Do not use barrels, remain constants as independent as possible
-import { isTestInstance, parseDurationToMs, sanitizeHost, sanitizeUrl } from '../helpers/core-utils'
+import { isTestInstance, isTestOrDevInstance, parseDurationToMs, sanitizeHost, sanitizeUrl } from '../helpers/core-utils'
 import { CONFIG, registerConfigChangedHandler } from './config'
 
 // ---------------------------------------------------------------------------
@@ -822,57 +822,62 @@ const STATS_TIMESERIE = {
 // ---------------------------------------------------------------------------
 
 // Special constants for a test instance
-if (isTestInstance() === true && process.env.PRODUCTION_CONSTANTS !== 'true') {
-  PRIVATE_RSA_KEY_SIZE = 1024
+if (process.env.PRODUCTION_CONSTANTS !== 'true') {
+  if (isTestOrDevInstance()) {
+    PRIVATE_RSA_KEY_SIZE = 1024
 
-  ACTOR_FOLLOW_SCORE.BASE = 20
+    ACTOR_FOLLOW_SCORE.BASE = 20
 
-  REMOTE_SCHEME.HTTP = 'http'
-  REMOTE_SCHEME.WS = 'ws'
+    REMOTE_SCHEME.HTTP = 'http'
+    REMOTE_SCHEME.WS = 'ws'
 
-  STATIC_MAX_AGE.SERVER = '0'
+    STATIC_MAX_AGE.SERVER = '0'
 
-  ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2
-  ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
-  ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
-  ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
+    SCHEDULER_INTERVALS_MS.ACTOR_FOLLOW_SCORES = 1000
+    SCHEDULER_INTERVALS_MS.REMOVE_OLD_JOBS = 10000
+    SCHEDULER_INTERVALS_MS.REMOVE_OLD_HISTORY = 5000
+    SCHEDULER_INTERVALS_MS.REMOVE_OLD_VIEWS = 5000
+    SCHEDULER_INTERVALS_MS.UPDATE_VIDEOS = 5000
+    SCHEDULER_INTERVALS_MS.AUTO_FOLLOW_INDEX_INSTANCES = 5000
+    SCHEDULER_INTERVALS_MS.UPDATE_INBOX_STATS = 5000
+    SCHEDULER_INTERVALS_MS.CHECK_PEERTUBE_VERSION = 2000
 
-  CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max = 100 * 1024 // 100KB
-  CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max = 400 * 1024 // 400KB
+    REPEAT_JOBS['videos-views-stats'] = { every: 5000 }
 
-  SCHEDULER_INTERVALS_MS.ACTOR_FOLLOW_SCORES = 1000
-  SCHEDULER_INTERVALS_MS.REMOVE_OLD_JOBS = 10000
-  SCHEDULER_INTERVALS_MS.REMOVE_OLD_HISTORY = 5000
-  SCHEDULER_INTERVALS_MS.REMOVE_OLD_VIEWS = 5000
-  SCHEDULER_INTERVALS_MS.UPDATE_VIDEOS = 5000
-  SCHEDULER_INTERVALS_MS.AUTO_FOLLOW_INDEX_INSTANCES = 5000
-  SCHEDULER_INTERVALS_MS.UPDATE_INBOX_STATS = 5000
-  SCHEDULER_INTERVALS_MS.CHECK_PEERTUBE_VERSION = 2000
+    REPEAT_JOBS['activitypub-cleaner'] = { every: 5000 }
+    AP_CLEANER.PERIOD = 5000
 
-  REPEAT_JOBS['videos-views-stats'] = { every: 5000 }
+    REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1
 
-  REPEAT_JOBS['activitypub-cleaner'] = { every: 5000 }
-  AP_CLEANER.PERIOD = 5000
+    CONTACT_FORM_LIFETIME = 1000 // 1 second
 
-  REDUNDANCY.VIDEOS.RANDOMIZED_FACTOR = 1
+    JOB_ATTEMPTS['email'] = 1
 
-  VIEW_LIFETIME.VIEWER_COUNTER = 1000 * 5 // 5 second
-  VIEW_LIFETIME.VIEWER_STATS = 1000 * 5 // 5 second
-  CONTACT_FORM_LIFETIME = 1000 // 1 second
+    FILES_CACHE.VIDEO_CAPTIONS.MAX_AGE = 3000
+    MEMOIZE_TTL.OVERVIEWS_SAMPLE = 3000
+    MEMOIZE_TTL.LIVE_ABLE_TO_UPLOAD = 3000
+    OVERVIEWS.VIDEOS.SAMPLE_THRESHOLD = 2
 
-  JOB_ATTEMPTS['email'] = 1
+    PLUGIN_EXTERNAL_AUTH_TOKEN_LIFETIME = 5000
+  }
+
+  if (isTestInstance()) {
+    ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2
+    ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
+    ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
+    ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
 
-  FILES_CACHE.VIDEO_CAPTIONS.MAX_AGE = 3000
-  MEMOIZE_TTL.OVERVIEWS_SAMPLE = 3000
-  MEMOIZE_TTL.LIVE_ABLE_TO_UPLOAD = 3000
-  OVERVIEWS.VIDEOS.SAMPLE_THRESHOLD = 2
+    CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max = 100 * 1024 // 100KB
+    CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max = 400 * 1024 // 400KB
 
-  PLUGIN_EXTERNAL_AUTH_TOKEN_LIFETIME = 5000
+    VIEW_LIFETIME.VIEWER_COUNTER = 1000 * 5 // 5 second
+    VIEW_LIFETIME.VIEWER_STATS = 1000 * 5 // 5 second
 
-  VIDEO_LIVE.CLEANUP_DELAY = getIntEnv('PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY') ?? 5000
-  VIDEO_LIVE.SEGMENT_TIME_SECONDS.DEFAULT_LATENCY = 2
-  VIDEO_LIVE.SEGMENT_TIME_SECONDS.SMALL_LATENCY = 1
-  VIDEO_LIVE.EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION = 1
+    VIDEO_LIVE.CLEANUP_DELAY = getIntEnv('PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY') ?? 5000
+    VIDEO_LIVE.SEGMENT_TIME_SECONDS.DEFAULT_LATENCY = 2
+    VIDEO_LIVE.SEGMENT_TIME_SECONDS.SMALL_LATENCY = 1
+    VIDEO_LIVE.EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION = 1
+  }
 }
 
 updateWebserverUrls()
diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index 09786a91f..91286241b 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -8,9 +8,10 @@ import { UserNotificationModel } from '@server/models/user/user-notification'
 import { UserVideoHistoryModel } from '@server/models/user/user-video-history'
 import { VideoJobInfoModel } from '@server/models/video/video-job-info'
 import { VideoLiveSessionModel } from '@server/models/video/video-live-session'
+import { VideoSourceModel } from '@server/models/video/video-source'
 import { LocalVideoViewerModel } from '@server/models/view/local-video-viewer'
 import { LocalVideoViewerWatchSectionModel } from '@server/models/view/local-video-viewer-watch-section'
-import { isTestInstance } from '../helpers/core-utils'
+import { isTestOrDevInstance } from '../helpers/core-utils'
 import { logger } from '../helpers/logger'
 import { AbuseModel } from '../models/abuse/abuse'
 import { AbuseMessageModel } from '../models/abuse/abuse-message'
@@ -49,7 +50,6 @@ import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-pla
 import { VideoTagModel } from '../models/video/video-tag'
 import { VideoViewModel } from '../models/view/video-view'
 import { CONFIG } from './config'
-import { VideoSourceModel } from '@server/models/video/video-source'
 
 require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string
 
@@ -81,13 +81,13 @@ const sequelizeTypescript = new SequelizeTypescript({
   pool: {
     max: poolMax
   },
-  benchmark: isTestInstance(),
+  benchmark: isTestOrDevInstance(),
   isolationLevel: Transaction.ISOLATION_LEVELS.SERIALIZABLE,
   logging: (message: string, benchmark: number) => {
     if (process.env.NODE_DB_LOG === 'false') return
 
     let newMessage = 'Executed SQL request'
-    if (isTestInstance() === true && benchmark !== undefined) {
+    if (isTestOrDevInstance() === true && benchmark !== undefined) {
       newMessage += ' in ' + benchmark + 'ms'
     }