From 52b1fd15fa9e2cc04873ad606e789929579483f2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 26 Aug 2021 11:01:59 +0200 Subject: Better logs for redundancy --- server/lib/redundancy.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'server/lib/redundancy.ts') diff --git a/server/lib/redundancy.ts b/server/lib/redundancy.ts index 2a9241249..2613d01be 100644 --- a/server/lib/redundancy.ts +++ b/server/lib/redundancy.ts @@ -1,5 +1,5 @@ import { Transaction } from 'sequelize' -import { logger } from '@server/helpers/logger' +import { logger, loggerTagsFactory } from '@server/helpers/logger' import { CONFIG } from '@server/initializers/config' import { ActorFollowModel } from '@server/models/actor/actor-follow' import { getServerActor } from '@server/models/application/application' @@ -8,6 +8,8 @@ import { Activity } from '@shared/models' import { VideoRedundancyModel } from '../models/redundancy/video-redundancy' import { sendUndoCacheFile } from './activitypub/send' +const lTags = loggerTagsFactory('redundancy') + async function removeVideoRedundancy (videoRedundancy: MVideoRedundancyVideo, t?: Transaction) { const serverActor = await getServerActor() @@ -28,7 +30,7 @@ async function removeRedundanciesOfServer (serverId: number) { async function isRedundancyAccepted (activity: Activity, byActor: MActorSignature) { const configAcceptFrom = CONFIG.REMOTE_REDUNDANCY.VIDEOS.ACCEPT_FROM if (configAcceptFrom === 'nobody') { - logger.info('Do not accept remote redundancy %s due instance accept policy.', activity.id) + logger.info('Do not accept remote redundancy %s due instance accept policy.', activity.id, lTags()) return false } @@ -37,7 +39,10 @@ async function isRedundancyAccepted (activity: Activity, byActor: MActorSignatur const allowed = await ActorFollowModel.isFollowedBy(byActor.id, serverActor.id) if (allowed !== true) { - logger.info('Do not accept remote redundancy %s because actor %s is not followed by our instance.', activity.id, byActor.url) + logger.info( + 'Do not accept remote redundancy %s because actor %s is not followed by our instance.', + activity.id, byActor.url, lTags() + ) return false } } -- cgit v1.2.3