forks/peertube
1
0
Fork 0
Code Releases Activity

Don't display log tag filter for audit logs

Browse source
This commit is contained in:
Chocobozzz 2021-11-16 10:49:03 +01:00
parent a2f99b54df
commit ac03618098
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/app/+admin/system/logs/logs.component.html
View file

@ -28,7 +28,7 @@
</ng-option>
</ng-select>
<my-select-tags i18n-placeholder placeholder="Filter logs by tags" [(ngModel)]="tagsOneOf" (ngModelChange)="refresh()"></my-select-tags>
<my-select-tags *ngIf="!isAuditLog()" i18n-placeholder placeholder="Filter logs by tags" [(ngModel)]="tagsOneOf" (ngModelChange)="refresh()"></my-select-tags>
<my-button i18n-label label="Refresh" icon="refresh" (click)="refresh()"></my-button>
</div>

19
server/helpers/requests.ts
View file

@ -6,9 +6,11 @@ import { CONFIG } from '../initializers/config'
import { ACTIVITY_PUB, BINARY_CONTENT_TYPES, PEERTUBE_VERSION, REQUEST_TIMEOUT, WEBSERVER } from '../initializers/constants'
import { pipelinePromise } from './core-utils'
import { processImage } from './image-utils'
import { logger } from './logger'
import { logger, loggerTagsFactory } from './logger'
import { getProxy, isProxyEnabled } from './proxy'
const lTags = loggerTagsFactory('request')
const httpSignature = require('@peertube/http-signature')
export interface PeerTubeRequestError extends Error {
@ -48,7 +50,7 @@ const peertubeGot = got.extend({
promiseOrStream.on('downloadProgress', progress => {
if (progress.transferred > bodyLimit && progress.percent !== 1) {
const message = `Exceeded the download limit of ${bodyLimit} B`
logger.warn(message)
logger.warn(message, lTags())
// CancelableRequest
if (promiseOrStream.cancel) {
@ -105,6 +107,7 @@ function doRequest (url: string, options: PeerTubeRequestOptions = {}) {
const gotOptions = buildGotOptions(options)
return peertubeGot(url, gotOptions)
.on('retry', logRetryFactory(url))
.catch(err => { throw buildRequestError(err) })
}
@ -112,6 +115,7 @@ function doJSONRequest <T> (url: string, options: PeerTubeRequestOptions = {}) {
const gotOptions = buildGotOptions(options)
return peertubeGot<T>(url, { ...gotOptions, responseType: 'json' })
.on('retry', logRetryFactory(url))
.catch(err => { throw buildRequestError(err) })
}
@ -131,7 +135,7 @@ async function doRequestAndSaveToFile (
)
} catch (err) {
remove(destPath)
.catch(err => logger.error('Cannot remove %s after request failure.', destPath, { err }))
.catch(err => logger.error('Cannot remove %s after request failure.', destPath, { err, ...lTags() }))
throw buildRequestError(err)
}
@ -157,7 +161,7 @@ function getAgent () {
const proxy = getProxy()
logger.info('Using proxy %s.', proxy)
logger.info('Using proxy %s.', proxy, lTags())
const proxyAgentOptions = {
keepAlive: true,
@ -229,6 +233,7 @@ function buildGotOptions (options: PeerTubeRequestOptions) {
timeout: REQUEST_TIMEOUT,
json: options.json,
searchParams: options.searchParams,
retry: 2,
headers,
context
}
@ -246,3 +251,9 @@ function buildRequestError (error: RequestError) {
return newError
}
function logRetryFactory (url: string) {
return (retryCount: number, error: RequestError) => {
logger.debug('Retrying request to %s.', url, { retryCount, error, ...lTags() })
}
}