From 8f0bc73d7d5f4c88cbc5588a0ece12b3855c8f98 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 11 Apr 2019 15:38:53 +0200 Subject: Add ability to limit videos history size --- server/initializers/config.ts | 11 ++++++++--- server/initializers/constants.ts | 9 +++++---- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/config.ts b/server/initializers/config.ts index 8dd62cba8..1f374dea9 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -2,7 +2,7 @@ import { IConfig } from 'config' import { dirname, join } from 'path' import { VideosRedundancy } from '../../shared/models' // Do not use barrels, remain constants as independent as possible -import { buildPath, parseBytes, parseDuration, root } from '../helpers/core-utils' +import { buildPath, parseBytes, parseDurationToMs, root } from '../helpers/core-utils' import { NSFWPolicyType } from '../../shared/models/videos/nsfw-policy.type' import * as bytes from 'bytes' @@ -80,7 +80,7 @@ const CONFIG = { }, REDUNDANCY: { VIDEOS: { - CHECK_INTERVAL: parseDuration(config.get('redundancy.videos.check_interval')), + CHECK_INTERVAL: parseDurationToMs(config.get('redundancy.videos.check_interval')), STRATEGIES: buildVideosRedundancy(config.get('redundancy.videos.strategies')) } }, @@ -94,6 +94,11 @@ const CONFIG = { PRIVATE: config.get('tracker.private'), REJECT_TOO_MANY_ANNOUNCES: config.get('tracker.reject_too_many_announces') }, + HISTORY: { + VIDEOS: { + MAX_AGE: parseDurationToMs(config.get('history.videos.max_age')) + } + }, ADMIN: { get EMAIL () { return config.get('admin.email') } }, @@ -216,7 +221,7 @@ function buildVideosRedundancy (objs: any[]): VideosRedundancy[] { return objs.map(obj => { return Object.assign({}, obj, { - minLifetime: parseDuration(obj.min_lifetime), + minLifetime: parseDurationToMs(obj.min_lifetime), size: bytes.parse(obj.size), minViews: obj.min_views }) diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index a0609d7cd..f008cd291 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -158,12 +158,12 @@ const JOB_REQUEST_TIMEOUT = 3000 // 3 seconds const JOB_COMPLETED_LIFETIME = 60000 * 60 * 24 * 2 // 2 days const VIDEO_IMPORT_TIMEOUT = 1000 * 3600 // 1 hour -// 1 hour -let SCHEDULER_INTERVALS_MS = { +const SCHEDULER_INTERVALS_MS = { actorFollowScores: 60000 * 60, // 1 hour removeOldJobs: 60000 * 60, // 1 hour updateVideos: 60000, // 1 minute - youtubeDLUpdate: 60000 * 60 * 24 // 1 day + youtubeDLUpdate: 60000 * 60 * 24, // 1 day + removeOldHistory: 60000 * 60 * 24 // 1 day } // --------------------------------------------------------------------------- @@ -591,6 +591,7 @@ if (isTestInstance() === true) { SCHEDULER_INTERVALS_MS.actorFollowScores = 1000 SCHEDULER_INTERVALS_MS.removeOldJobs = 10000 + SCHEDULER_INTERVALS_MS.removeOldHistory = 5000 SCHEDULER_INTERVALS_MS.updateVideos = 5000 REPEAT_JOBS[ 'videos-views' ] = { every: 5000 } @@ -734,7 +735,7 @@ function buildVideosExtname () { } function loadLanguages () { - VIDEO_LANGUAGES = buildLanguages() + Object.assign(VIDEO_LANGUAGES, buildLanguages()) } function buildLanguages () { -- cgit v1.2.3