summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2024-08-03 16:40:26 +0200
committerLibravatar GitHub <noreply@github.com>2024-08-03 16:40:26 +0200
commitfa59c3713c14bd1463b923d57a57a914622626d7 (patch)
tree255f4e4995fb308da9f2e0f0377ede02089ebff3 /cmd
parent[chore/frontend] Update namerole rendering on skinny devices (#3166) (diff)
downloadgotosocial-fa59c3713c14bd1463b923d57a57a914622626d7.tar.xz
[chore] Add `media-ffmpeg-pool-size` config var (#3164)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/gotosocial/action/server/server.go16
1 files changed, 12 insertions, 4 deletions
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
}