Fix checker if we don't have redundancy strategies

diff --git a/config/test.yaml b/config/test.yaml
index 517fc74494ae532a83d25042aa20521ee5b0e888..16113211e0fcce9703339f15e2840a03684aa4c9 100644 (file)
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -24,13 +24,13 @@ log:
 redundancy:
   videos:
     -
-      size: '100KB'
+      size: '10MB'
       strategy: 'most-views'
     -
-      size: '100KB'
+      size: '10MB'
       strategy: 'trending'
     -
-      size: '100KB'
+      size: '10MB'
       strategy: 'recently-added'
       minViews: 10
 

diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts
index 29f4f30360e8e0683264db71d303306a42356dd6..b9dc1e725468cee4737b0273e5b3197e162c5ea1 100644 (file)
--- a/server/initializers/checker.ts
+++ b/server/initializers/checker.ts
@@ -52,11 +52,11 @@ function checkConfig () {
     if (filtered.length !== redundancyVideos.length) {
       return 'Redundancy video entries should have unique strategies'
     }
-  }
 
-  const recentlyAddedStrategy = redundancyVideos.find(r => r.strategy === 'recently-added') as RecentlyAddedStrategy
-  if (recentlyAddedStrategy && isNaN(recentlyAddedStrategy.minViews)) {
-    return 'Min views in recently added strategy is not a number'
+    const recentlyAddedStrategy = redundancyVideos.find(r => r.strategy === 'recently-added') as RecentlyAddedStrategy
+    if (recentlyAddedStrategy && isNaN(recentlyAddedStrategy.minViews)) {
+      return 'Min views in recently added strategy is not a number'
+    }
   }
 
   return null

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 02363352ec5250cfe9febe6fd19e104833789245..fa90939186a6a69a692ad26e94abba67cffe9833 100644 (file)
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -660,7 +660,7 @@ if (isTestInstance() === true) {
 
   CACHE.VIDEO_CAPTIONS.MAX_AGE = 3000
   MEMOIZE_TTL.OVERVIEWS_SAMPLE = 1
-  ROUTE_CACHE_LIFETIME.OVERVIEWS.VIDEOS = '0'
+  ROUTE_CACHE_LIFETIME.OVERVIEWS.VIDEOS = '0ms'
 }
 
 updateWebserverConfig()