Verified Commit 9de33c6b authored by Chocobozzz's avatar Chocobozzz
Browse files

Add logs for refresh functions

parent 7ffa92d6
import { logger } from '@server/helpers/logger' import { logger, loggerTagsFactory } from '@server/helpers/logger'
import { PeerTubeRequestError } from '@server/helpers/requests' import { PeerTubeRequestError } from '@server/helpers/requests'
import { ActorLoadByUrlType } from '@server/lib/model-loaders' import { ActorLoadByUrlType } from '@server/lib/model-loaders'
import { ActorModel } from '@server/models/actor/actor' import { ActorModel } from '@server/models/actor/actor'
...@@ -19,6 +19,10 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel ...@@ -19,6 +19,10 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel
? actorArg as MActorFull ? actorArg as MActorFull
: await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url) : await ActorModel.loadByUrlAndPopulateAccountAndChannel(actorArg.url)
const lTags = loggerTagsFactory('ap', 'actor', 'refresh', actor.url)
logger.info('Refreshing actor %s.', actor.url, lTags())
try { try {
const actorUrl = await getActorUrl(actor) const actorUrl = await getActorUrl(actor)
const { actorObject } = await fetchRemoteActor(actorUrl) const { actorObject } = await fetchRemoteActor(actorUrl)
...@@ -34,7 +38,7 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel ...@@ -34,7 +38,7 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel
return { refreshed: true, actor } return { refreshed: true, actor }
} catch (err) { } catch (err) {
if ((err as PeerTubeRequestError).statusCode === HttpStatusCode.NOT_FOUND_404) { 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 actor.Account
? await actor.Account.destroy() ? await actor.Account.destroy()
...@@ -43,7 +47,7 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel ...@@ -43,7 +47,7 @@ async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannel
return { actor: undefined, refreshed: false } 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 } return { actor, refreshed: false }
} }
} }
......
...@@ -10,6 +10,8 @@ async function refreshVideoPlaylistIfNeeded (videoPlaylist: MVideoPlaylistOwner) ...@@ -10,6 +10,8 @@ async function refreshVideoPlaylistIfNeeded (videoPlaylist: MVideoPlaylistOwner)
const lTags = loggerTagsFactory('ap', 'video-playlist', 'refresh', videoPlaylist.uuid, videoPlaylist.url) const lTags = loggerTagsFactory('ap', 'video-playlist', 'refresh', videoPlaylist.uuid, videoPlaylist.url)
logger.info('Refreshing playlist %s.', videoPlaylist.url, lTags())
try { try {
const { playlistObject } = await fetchRemoteVideoPlaylist(videoPlaylist.url) const { playlistObject } = await fetchRemoteVideoPlaylist(videoPlaylist.url)
......
...@@ -22,6 +22,8 @@ async function refreshVideoIfNeeded (options: { ...@@ -22,6 +22,8 @@ async function refreshVideoIfNeeded (options: {
const lTags = loggerTagsFactory('ap', 'video', 'refresh', video.uuid, video.url) const lTags = loggerTagsFactory('ap', 'video', 'refresh', video.uuid, video.url)
logger.info('Refreshing video %s.', video.url, lTags())
try { try {
const { videoObject } = await fetchRemoteVideo(video.url) const { videoObject } = await fetchRemoteVideo(video.url)
......
...@@ -215,7 +215,7 @@ describe('Test blocklist', function () { ...@@ -215,7 +215,7 @@ describe('Test blocklist', function () {
const threads: VideoComment[] = resThreads.body.data const threads: VideoComment[] = resThreads.body.data
expect(threads).to.have.lengthOf(1) expect(threads).to.have.lengthOf(1)
expect(threads[0].totalReplies).to.equal(0) expect(threads[0].totalReplies).to.equal(1)
const t = threads.find(t => t.text === 'comment user 1') const t = threads.find(t => t.text === 'comment user 1')
expect(t).to.be.undefined expect(t).to.be.undefined
...@@ -565,7 +565,7 @@ describe('Test blocklist', function () { ...@@ -565,7 +565,7 @@ describe('Test blocklist', function () {
threads = threads.filter(t => t.isDeleted === false) threads = threads.filter(t => t.isDeleted === false)
expect(threads).to.have.lengthOf(1) expect(threads).to.have.lengthOf(1)
expect(threads[0].totalReplies).to.equal(0) expect(threads[0].totalReplies).to.equal(1)
const t = threads.find(t => t.text === 'comment user 1') const t = threads.find(t => t.text === 'comment user 1')
expect(t).to.be.undefined expect(t).to.be.undefined
......
...@@ -519,7 +519,7 @@ describe('Test follows', function () { ...@@ -519,7 +519,7 @@ describe('Test follows', function () {
expect(deletedComment.text).to.equal('') expect(deletedComment.text).to.equal('')
expect(deletedComment.inReplyToCommentId).to.be.null expect(deletedComment.inReplyToCommentId).to.be.null
expect(deletedComment.account).to.be.null expect(deletedComment.account).to.be.null
expect(deletedComment.totalReplies).to.equal(3) expect(deletedComment.totalReplies).to.equal(2)
expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true
const res2 = await getVideoThreadComments(servers[0].url, video4.id, deletedComment.threadId) const res2 = await getVideoThreadComments(servers[0].url, video4.id, deletedComment.threadId)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment