OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

More info when logging the request

pull/6610/head
Chocobozzz 2024-09-17 08:35:54 +02:00
parent 5ae90e0757
commit a9cb29dfc1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/helpers/requests.ts
View File

@ -14,9 +14,13 @@ const lTags = loggerTagsFactory('request')
export interface PeerTubeRequestError extends Error { export interface PeerTubeRequestError extends Error {
statusCode?: number statusCode?: number
responseBody?: any responseBody?: any
responseHeaders?: any responseHeaders?: any
requestHeaders?: any requestHeaders?: any
requestUrl?: any
requestMethod?: any
} }
export type PeerTubeRequestOptions = { export type PeerTubeRequestOptions = {
@ -251,6 +255,8 @@ function buildRequestError (error: RequestError) {
if (error.options) { if (error.options) {
newError.requestHeaders = error.options.headers newError.requestHeaders = error.options.headers
newError.requestUrl = error.options.url
newError.requestMethod = error.options.method
} }
return newError return newError

4
server/core/lib/activitypub/playlists/create-update.ts
View File

@ -38,7 +38,7 @@ async function createAccountPlaylists (playlistUrls: string[]) {
return createOrUpdateVideoPlaylist(playlistObject) return createOrUpdateVideoPlaylist(playlistObject)
} catch (err) { } catch (err) {
logger.warn('Cannot add playlist element %s.', playlistUrl, { err, ...lTags(playlistUrl) }) logger.warn('Cannot add playlist element ' + playlistUrl, { err, ...lTags(playlistUrl) })
} }
}, { concurrency: CRAWL_REQUEST_CONCURRENCY }) }, { concurrency: CRAWL_REQUEST_CONCURRENCY })
} }
@ -149,7 +149,7 @@ async function buildElementsDBAttributes (elementUrls: string[], playlist: MVide
elementsToCreate.push(playlistElementObjectToDBAttributes(elementObject, playlist, video)) elementsToCreate.push(playlistElementObjectToDBAttributes(elementObject, playlist, video))
} catch (err) { } catch (err) {
logger.warn('Cannot add playlist element %s.', elementUrl, { err, ...lTags(playlist.uuid, playlist.url) }) logger.warn('Cannot add playlist element ' + elementUrl, { err, ...lTags(playlist.uuid, playlist.url) })
} }
}, { concurrency: CRAWL_REQUEST_CONCURRENCY }) }, { concurrency: CRAWL_REQUEST_CONCURRENCY })

2
server/core/lib/activitypub/process/process-delete.ts
View File

@ -29,7 +29,7 @@ async function processDeleteActivity (options: APProcessorOptions<ActivityDelete
const byActorFull = await ActorModel.loadByUrlAndPopulateAccountAndChannel(byActor.url) const byActorFull = await ActorModel.loadByUrlAndPopulateAccountAndChannel(byActor.url)
if (isAccountActor(byActorFull.type)) { if (isAccountActor(byActorFull.type)) {
if (!byActorFull.Account) throw new Error('Actor ' + byActorFull.url + ' is a person but we cannot find it in database.') if (!byActorFull.Account) throw new Error(`Actor ${byActorFull.url} is a person but we cannot find the account in database.`)
const accountToDelete = byActorFull.Account as MAccountActor const accountToDelete = byActorFull.Account as MAccountActor
accountToDelete.Actor = byActorFull accountToDelete.Actor = byActorFull