X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fredundancy.ts;h=2613d01be1ffa19826a2649febb1f04697d057d5;hb=5e47f6ab984a7d00782e4c7030afffa1ba480add;hp=2a92412491bd112b07efe7e7f7ecdadec5e9370e;hpb=7d9ba5c08999c6482f0bc5e0c09c6f55b7724090;p=github%2FChocobozzz%2FPeerTube.git

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
     }
   }