From 8e8234abba7b64767e9ffb6dc38758a62b1ea16c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 23 Mar 2018 09:10:49 +0100 Subject: [PATCH] Improve logging when cannot fetch remote videos --- server/lib/activitypub/videos.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 907fe458d..2a6636625 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -177,7 +177,9 @@ async function getOrCreateVideo (videoObject: VideoTorrentObject, channelActor: async function getOrCreateAccountAndVideoAndChannel (videoObject: VideoTorrentObject | string, actor?: ActorModel) { if (typeof videoObject === 'string') { - const videoFromDatabase = await VideoModel.loadByUrlAndPopulateAccount(videoObject) + const videoUrl = videoObject + + const videoFromDatabase = await VideoModel.loadByUrlAndPopulateAccount(videoUrl) if (videoFromDatabase) { return { video: videoFromDatabase, @@ -186,8 +188,8 @@ async function getOrCreateAccountAndVideoAndChannel (videoObject: VideoTorrentOb } } - videoObject = await fetchRemoteVideo(videoObject) - if (!videoObject) throw new Error('Cannot fetch remote video (maybe invalid...)') + videoObject = await fetchRemoteVideo(videoUrl) + if (!videoObject) throw new Error('Cannot fetch remote video with url: ' + videoUrl) } if (!actor) { @@ -268,9 +270,12 @@ async function addVideoShares (instance: VideoModel, shareUrls: string[]) { json: true, activityPub: true }) - const actorUrl = body.actor - if (!actorUrl) continue + if (!body || !body.actor) { + logger.warn('Cannot add remote share with url: %s, skipping...', shareUrl) + continue + } + const actorUrl = body.actor const actor = await getOrCreateActorAndServerAndModel(actorUrl) const entry = {