From fa59c3713c14bd1463b923d57a57a914622626d7 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 3 Aug 2024 16:40:26 +0200 Subject: [chore] Add `media-ffmpeg-pool-size` config var (#3164) --- cmd/gotosocial/action/server/server.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index 68b039d0c..c2c5e25cd 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -487,16 +487,24 @@ func setLimits(ctx context.Context) { } func precompileWASM(ctx context.Context) error { - // TODO: make max number instances configurable - maxprocs := runtime.GOMAXPROCS(0) if err := sqlite3.Initialize(); err != nil { return gtserror.Newf("error compiling sqlite3: %w", err) } - if err := ffmpeg.InitFfmpeg(ctx, maxprocs); err != nil { + + // Use admin-set ffmpeg pool size, and fall + // back to GOMAXPROCS if number 0 or less. + ffPoolSize := config.GetMediaFfmpegPoolSize() + if ffPoolSize <= 0 { + ffPoolSize = runtime.GOMAXPROCS(0) + } + + if err := ffmpeg.InitFfmpeg(ctx, ffPoolSize); err != nil { return gtserror.Newf("error compiling ffmpeg: %w", err) } - if err := ffmpeg.InitFfprobe(ctx, maxprocs); err != nil { + + if err := ffmpeg.InitFfprobe(ctx, ffPoolSize); err != nil { return gtserror.Newf("error compiling ffprobe: %w", err) } + return nil } -- cgit v1.2.3