From cfaf819c38dc0de996c9844e5ef0ee364944d41f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 25 Sep 2018 16:31:16 +0200 Subject: [PATCH] Reduce video import TTL --- server/initializers/constants.ts | 2 +- server/lib/activitypub/process/process-create.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 947cbda28..8e019f61e 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -119,7 +119,7 @@ const JOB_TTL: { [ id in JobType ]: number } = { 'activitypub-follow': 60000 * 10, // 10 minutes 'video-file-import': 1000 * 3600, // 1 hour 'video-file': 1000 * 3600 * 48, // 2 days, transcoding could be long - 'video-import': 1000 * 3600 * 5, // 5 hours + 'video-import': 1000 * 3600 * 5, // 1 hour 'email': 60000 * 10, // 10 minutes 'videos-views': undefined // Unlimited } diff --git a/server/lib/activitypub/process/process-create.ts b/server/lib/activitypub/process/process-create.ts index ceb5413ca..c2160872f 100644 --- a/server/lib/activitypub/process/process-create.ts +++ b/server/lib/activitypub/process/process-create.ts @@ -9,7 +9,7 @@ import { ActorModel } from '../../../models/activitypub/actor' import { VideoAbuseModel } from '../../../models/video/video-abuse' import { addVideoComment, resolveThread } from '../video-comments' import { getOrCreateVideoAndAccountAndChannel } from '../videos' -import { forwardActivity, forwardVideoRelatedActivity } from '../send/utils' +import { forwardVideoRelatedActivity } from '../send/utils' import { Redis } from '../../redis' import { createCacheFile } from '../cache-file'