From 9de33c6bd9580ab43cc7bc089c54b2fe2bdfd72d Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 8 Jun 2021 16:19:09 +0200
Subject: Add logs for refresh functions

---
 server/lib/activitypub/actors/refresh.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'server/lib/activitypub/actors/refresh.ts')

diff --git a/server/lib/activitypub/actors/refresh.ts b/server/lib/activitypub/actors/refresh.ts
index 9758649a5..1f7cfcd8f 100644
--- a/server/lib/activitypub/actors/refresh.ts
+++ b/server/lib/activitypub/actors/refresh.ts
@@ -1,4 +1,4 @@
-import { logger } from '@server/helpers/logger'
+import { logger, loggerTagsFactory } from '@server/helpers/logger'
 import { PeerTubeRequestError } from '@server/helpers/requests'
 import { ActorLoadByUrlType } from '@server/lib/model-loaders'
 import { ActorModel } from '@server/models/actor/actor'
@@ -19,6 +19,10 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel
     ? actorArg as MActorFull
     : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url)
 
+  const lTags = loggerTagsFactory('ap', 'actor', 'refresh', actor.url)
+
+  logger.info('Refreshing actor %s.', actor.url, lTags())
+
   try {
     const actorUrl = await getActorUrl(actor)
     const { actorObject } = await fetchRemoteActor(actorUrl)
@@ -34,7 +38,7 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel
     return { refreshed: true, actor }
   } catch (err) {
     if ((err as PeerTubeRequestError).statusCode === HttpStatusCode.NOT_FOUND_404) {
-      logger.info('Deleting actor %s because there is a 404 in refresh actor.', actor.url)
+      logger.info('Deleting actor %s because there is a 404 in refresh actor.', actor.url, lTags())
 
       actor.Account
         ? await actor.Account.destroy()
@@ -43,7 +47,7 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel
       return { actor: undefined, refreshed: false }
     }
 
-    logger.warn('Cannot refresh actor %s.', actor.url, { err })
+    logger.warn('Cannot refresh actor %s.', actor.url, { err, ...lTags() })
     return { actor, refreshed: false }
   }
 }
-- 
cgit v1.2.3