From 93904032506dd222404d9be60fd2e41763554665 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Nov 2021 09:53:55 +0100 Subject: Add ffmpeg tags for ffmpeg logs --- server/helpers/ffmpeg-utils.ts | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'server') diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index ec24f357b..cc79828f6 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts @@ -16,7 +16,9 @@ import { CONFIG } from '../initializers/config' import { execPromise, promisify0 } from './core-utils' import { computeFPS, ffprobePromise, getAudioStream, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from './ffprobe-utils' import { processImage } from './image-utils' -import { logger } from './logger' +import { logger, loggerTagsFactory } from './logger' + +const lTags = loggerTagsFactory('ffmpeg') /** * @@ -60,7 +62,7 @@ async function checkFFmpegEncoders (peertubeAvailableEncoders: AvailableEncoders supportedEncoders.set(searchEncoder, availableFFmpegEncoders[searchEncoder] !== undefined) } - logger.info('Built supported ffmpeg encoders.', { supportedEncoders, searchEncoders }) + logger.info('Built supported ffmpeg encoders.', { supportedEncoders, searchEncoders, ...lTags() }) return supportedEncoders } @@ -115,12 +117,12 @@ async function generateImageFromVideoFile (fromPath: string, folder: string, ima const destination = join(folder, imageName) await processImage(pendingImagePath, destination, size) } catch (err) { - logger.error('Cannot generate image from video %s.', fromPath, { err }) + logger.error('Cannot generate image from video %s.', fromPath, { err, ...lTags() }) try { await remove(pendingImagePath) } catch (err) { - logger.debug('Cannot remove pending image path after generation error.', { err }) + logger.debug('Cannot remove pending image path after generation error.', { err, ...lTags() }) } } } @@ -202,7 +204,7 @@ const builders: { } async function transcode (options: TranscodeOptions) { - logger.debug('Will run transcode.', { options }) + logger.debug('Will run transcode.', { options, ...lTags() }) let command = getFFmpeg(options.inputPath, 'vod') .output(options.outputPath) @@ -284,7 +286,7 @@ async function getLiveTranscodingCommand (options: { addDefaultEncoderParams({ command, encoder: builderResult.encoder, fps: resolutionFPS, streamNum: i }) - logger.debug('Apply ffmpeg live video params from %s using %s profile.', builderResult.encoder, profile, builderResult) + logger.debug('Apply ffmpeg live video params from %s using %s profile.', builderResult.encoder, profile, builderResult, lTags()) command.outputOption(`${buildStreamSuffix('-c:v', i)} ${builderResult.encoder}`) applyEncoderOptions(command, builderResult.result) @@ -308,7 +310,7 @@ async function getLiveTranscodingCommand (options: { addDefaultEncoderParams({ command, encoder: builderResult.encoder, fps: resolutionFPS, streamNum: i }) - logger.debug('Apply ffmpeg live audio params from %s using %s profile.', builderResult.encoder, profile, builderResult) + logger.debug('Apply ffmpeg live audio params from %s using %s profile.', builderResult.encoder, profile, builderResult, lTags()) command.outputOption(`${buildStreamSuffix('-c:a', i)} ${builderResult.encoder}`) applyEncoderOptions(command, builderResult.result) @@ -531,12 +533,12 @@ async function getEncoderBuilderResult (options: EncoderOptionsBuilderParams & { for (const encoder of encodersToTry) { if (!(await checkFFmpegEncoders(availableEncoders)).get(encoder)) { - logger.debug('Encoder %s not available in ffmpeg, skipping.', encoder) + logger.debug('Encoder %s not available in ffmpeg, skipping.', encoder, lTags()) continue } if (!encoders[encoder]) { - logger.debug('Encoder %s not available in peertube encoders, skipping.', encoder) + logger.debug('Encoder %s not available in peertube encoders, skipping.', encoder, lTags()) continue } @@ -545,11 +547,11 @@ async function getEncoderBuilderResult (options: EncoderOptionsBuilderParams & { let builder = builderProfiles[profile] if (!builder) { - logger.debug('Profile %s for encoder %s not available. Fallback to default.', profile, encoder) + logger.debug('Profile %s for encoder %s not available. Fallback to default.', profile, encoder, lTags()) builder = builderProfiles.default if (!builder) { - logger.debug('Default profile for encoder %s not available. Try next available encoder.', encoder) + logger.debug('Default profile for encoder %s not available. Try next available encoder.', encoder, lTags()) continue } } @@ -619,7 +621,8 @@ async function presetVideo (options: { logger.debug( 'Apply ffmpeg params from %s for %s stream of input %s using %s profile.', - builderResult.encoder, streamType, input, profile, builderResult + builderResult.encoder, streamType, input, profile, builderResult, + lTags() ) if (streamType === 'video') { @@ -725,13 +728,13 @@ async function runCommand (options: { command.on('start', cmdline => { shellCommand = cmdline }) command.on('error', (err, stdout, stderr) => { - if (silent !== true) logger.error('Error in ffmpeg.', { stdout, stderr }) + if (silent !== true) logger.error('Error in ffmpeg.', { stdout, stderr, ...lTags() }) rej(err) }) command.on('end', (stdout, stderr) => { - logger.debug('FFmpeg command ended.', { stdout, stderr, shellCommand }) + logger.debug('FFmpeg command ended.', { stdout, stderr, shellCommand, ...lTags() }) res() }) @@ -741,7 +744,7 @@ async function runCommand (options: { if (!progress.percent) return job.progress(Math.round(progress.percent)) - .catch(err => logger.warn('Cannot set ffmpeg job progress.', { err })) + .catch(err => logger.warn('Cannot set ffmpeg job progress.', { err, ...lTags() })) }) } -- cgit v1.2.3