From 619537426bbb9fcb9f2825068d5f907db0dc1f09 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 22 Oct 2021 10:28:00 +0200 Subject: [PATCH] Constants consistency --- server/initializers/constants.ts | 38 +++++++++---------- server/lib/activitypub/inbox-manager.ts | 2 +- .../lib/schedulers/actor-follow-scheduler.ts | 2 +- .../schedulers/auto-follow-index-instances.ts | 2 +- .../peertube-version-check-scheduler.ts | 2 +- .../lib/schedulers/plugins-check-scheduler.ts | 2 +- ...ve-dangling-resumable-uploads-scheduler.ts | 2 +- .../remove-old-history-scheduler.ts | 2 +- .../schedulers/remove-old-jobs-scheduler.ts | 2 +- .../schedulers/remove-old-views-scheduler.ts | 2 +- .../lib/schedulers/update-videos-scheduler.ts | 2 +- .../schedulers/youtube-dl-update-scheduler.ts | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 1d434d5ab..dc5747fc7 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -206,17 +206,17 @@ const JOB_COMPLETED_LIFETIME = 60000 * 60 * 24 * 2 // 2 days const VIDEO_IMPORT_TIMEOUT = 1000 * 3600 // 1 hour const SCHEDULER_INTERVALS_MS = { - actorFollowScores: 60000 * 60, // 1 hour - removeOldJobs: 60000 * 60, // 1 hour - updateVideos: 60000, // 1 minute - youtubeDLUpdate: 60000 * 60 * 24, // 1 day - checkPlugins: CONFIG.PLUGINS.INDEX.CHECK_LATEST_VERSIONS_INTERVAL, - checkPeerTubeVersion: 60000 * 60 * 24, // 1 day - autoFollowIndexInstances: 60000 * 60 * 24, // 1 day - removeOldViews: 60000 * 60 * 24, // 1 day - removeOldHistory: 60000 * 60 * 24, // 1 day - updateInboxStats: 1000 * 60, // 1 minute - removeDanglingResumableUploads: 60000 * 60 * 16 // 16 hours + ACTOR_FOLLOW_SCORES: 60000 * 60, // 1 hour + REMOVE_OLD_JOBS: 60000 * 60, // 1 hour + UPDATE_VIDEOS: 60000, // 1 minute + YOUTUBE_DL_UPDATE: 60000 * 60 * 24, // 1 day + CHECK_PLUGINS: CONFIG.PLUGINS.INDEX.CHECK_LATEST_VERSIONS_INTERVAL, + CHECK_PEERTUBE_VERSION: 60000 * 60 * 24, // 1 day + AUTO_FOLLOW_INDEX_INSTANCES: 60000 * 60 * 24, // 1 day + REMOVE_OLD_VIEWS: 60000 * 60 * 24, // 1 day + REMOVE_OLD_HISTORY: 60000 * 60 * 24, // 1 day + UPDATE_INBOX_STATS: 1000 * 60, // 1 minute + REMOVE_DANGLING_RESUMABLE_UPLOADS: 60000 * 60 * 16 // 16 hours } // --------------------------------------------------------------------------- @@ -782,14 +782,14 @@ if (isTestInstance() === true) { CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max = 100 * 1024 // 100KB CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max = 400 * 1024 // 400KB - SCHEDULER_INTERVALS_MS.actorFollowScores = 1000 - SCHEDULER_INTERVALS_MS.removeOldJobs = 10000 - SCHEDULER_INTERVALS_MS.removeOldHistory = 5000 - SCHEDULER_INTERVALS_MS.removeOldViews = 5000 - SCHEDULER_INTERVALS_MS.updateVideos = 5000 - SCHEDULER_INTERVALS_MS.autoFollowIndexInstances = 5000 - SCHEDULER_INTERVALS_MS.updateInboxStats = 5000 - SCHEDULER_INTERVALS_MS.checkPeerTubeVersion = 2000 + 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['videos-views'] = { every: 5000 } REPEAT_JOBS['activitypub-cleaner'] = { every: 5000 } diff --git a/server/lib/activitypub/inbox-manager.ts b/server/lib/activitypub/inbox-manager.ts index 282e7ce66..f2785d6ce 100644 --- a/server/lib/activitypub/inbox-manager.ts +++ b/server/lib/activitypub/inbox-manager.ts @@ -32,7 +32,7 @@ class InboxManager { setInterval(() => { StatsManager.Instance.updateInboxWaiting(this.getActivityPubMessagesWaiting()) - }, SCHEDULER_INTERVALS_MS.updateInboxStats) + }, SCHEDULER_INTERVALS_MS.UPDATE_INBOX_STATS) } addInboxMessage (options: QueueParam) { diff --git a/server/lib/schedulers/actor-follow-scheduler.ts b/server/lib/schedulers/actor-follow-scheduler.ts index a5a377573..560f97f3e 100644 --- a/server/lib/schedulers/actor-follow-scheduler.ts +++ b/server/lib/schedulers/actor-follow-scheduler.ts @@ -9,7 +9,7 @@ export class ActorFollowScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.actorFollowScores + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.ACTOR_FOLLOW_SCORES private constructor () { super() diff --git a/server/lib/schedulers/auto-follow-index-instances.ts b/server/lib/schedulers/auto-follow-index-instances.ts index aaa5feed5..d9f9c2de3 100644 --- a/server/lib/schedulers/auto-follow-index-instances.ts +++ b/server/lib/schedulers/auto-follow-index-instances.ts @@ -12,7 +12,7 @@ export class AutoFollowIndexInstances extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.autoFollowIndexInstances + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.AUTO_FOLLOW_INDEX_INSTANCES private lastCheck: Date diff --git a/server/lib/schedulers/peertube-version-check-scheduler.ts b/server/lib/schedulers/peertube-version-check-scheduler.ts index c8960465c..bc38ed49f 100644 --- a/server/lib/schedulers/peertube-version-check-scheduler.ts +++ b/server/lib/schedulers/peertube-version-check-scheduler.ts @@ -13,7 +13,7 @@ export class PeerTubeVersionCheckScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.checkPeerTubeVersion + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.CHECK_PEERTUBE_VERSION private constructor () { super() diff --git a/server/lib/schedulers/plugins-check-scheduler.ts b/server/lib/schedulers/plugins-check-scheduler.ts index c95e109b0..06450fa01 100644 --- a/server/lib/schedulers/plugins-check-scheduler.ts +++ b/server/lib/schedulers/plugins-check-scheduler.ts @@ -12,7 +12,7 @@ export class PluginsCheckScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.checkPlugins + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.CHECK_PLUGINS private constructor () { super() diff --git a/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts index 099fa5651..d6e561cad 100644 --- a/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts +++ b/server/lib/schedulers/remove-dangling-resumable-uploads-scheduler.ts @@ -13,7 +13,7 @@ export class RemoveDanglingResumableUploadsScheduler extends AbstractScheduler { private static instance: AbstractScheduler private lastExecutionTimeMs: number - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.removeDanglingResumableUploads + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.REMOVE_DANGLING_RESUMABLE_UPLOADS private constructor () { super() diff --git a/server/lib/schedulers/remove-old-history-scheduler.ts b/server/lib/schedulers/remove-old-history-scheduler.ts index 225669ea2..34b160799 100644 --- a/server/lib/schedulers/remove-old-history-scheduler.ts +++ b/server/lib/schedulers/remove-old-history-scheduler.ts @@ -8,7 +8,7 @@ export class RemoveOldHistoryScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.removeOldHistory + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.REMOVE_OLD_HISTORY private constructor () { super() diff --git a/server/lib/schedulers/remove-old-jobs-scheduler.ts b/server/lib/schedulers/remove-old-jobs-scheduler.ts index 0179a7618..dffef3542 100644 --- a/server/lib/schedulers/remove-old-jobs-scheduler.ts +++ b/server/lib/schedulers/remove-old-jobs-scheduler.ts @@ -8,7 +8,7 @@ export class RemoveOldJobsScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.removeOldJobs + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.REMOVE_OLD_JOBS private constructor () { super() diff --git a/server/lib/schedulers/remove-old-views-scheduler.ts b/server/lib/schedulers/remove-old-views-scheduler.ts index 73577a421..64bef97fe 100644 --- a/server/lib/schedulers/remove-old-views-scheduler.ts +++ b/server/lib/schedulers/remove-old-views-scheduler.ts @@ -8,7 +8,7 @@ export class RemoveOldViewsScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.removeOldViews + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.REMOVE_OLD_VIEWS private constructor () { super() diff --git a/server/lib/schedulers/update-videos-scheduler.ts b/server/lib/schedulers/update-videos-scheduler.ts index af69bda89..c652682dd 100644 --- a/server/lib/schedulers/update-videos-scheduler.ts +++ b/server/lib/schedulers/update-videos-scheduler.ts @@ -12,7 +12,7 @@ export class UpdateVideosScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.updateVideos + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.UPDATE_VIDEOS private constructor () { super() diff --git a/server/lib/schedulers/youtube-dl-update-scheduler.ts b/server/lib/schedulers/youtube-dl-update-scheduler.ts index 93d02f8a9..1ee4ae1b2 100644 --- a/server/lib/schedulers/youtube-dl-update-scheduler.ts +++ b/server/lib/schedulers/youtube-dl-update-scheduler.ts @@ -6,7 +6,7 @@ export class YoutubeDlUpdateScheduler extends AbstractScheduler { private static instance: AbstractScheduler - protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.youtubeDLUpdate + protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.YOUTUBE_DL_UPDATE private constructor () { super() -- 2.41.0