diff options
Diffstat (limited to 'internal/workers/workers.go')
| -rw-r--r-- | internal/workers/workers.go | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/internal/workers/workers.go b/internal/workers/workers.go index 3617ce333..17728c255 100644 --- a/internal/workers/workers.go +++ b/internal/workers/workers.go @@ -23,14 +23,22 @@ import ( "runtime" "codeberg.org/gruf/go-runners" + "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/scheduler" + "github.com/superseriousbusiness/gotosocial/internal/transport/delivery" ) type Workers struct { // Main task scheduler instance. Scheduler scheduler.Scheduler + // Delivery provides a worker pool that + // handles outgoing ActivityPub deliveries. + // It contains an embedded (but accessible) + // indexed queue of Delivery{} objects. + Delivery delivery.WorkerPool + // ClientAPI provides a worker pool that handles both // incoming client actions, and our own side-effects. ClientAPI runners.WorkerPool @@ -65,13 +73,23 @@ type Workers struct { _ nocopy } -// Start will start all of the contained worker pools (and global scheduler). +// Start will start all of the contained +// worker pools (and global scheduler). func (w *Workers) Start() { // Get currently set GOMAXPROCS. maxprocs := runtime.GOMAXPROCS(0) tryUntil("starting scheduler", 5, w.Scheduler.Start) + tryUntil("start delivery workerpool", 5, func() bool { + n := config.GetAdvancedSenderMultiplier() + if n < 1 { + // clamp min senders to 1. + return w.Delivery.Start(1) + } + return w.Delivery.Start(n * maxprocs) + }) + tryUntil("starting client API workerpool", 5, func() bool { return w.ClientAPI.Start(4*maxprocs, 400*maxprocs) }) @@ -88,6 +106,7 @@ func (w *Workers) Start() { // Stop will stop all of the contained worker pools (and global scheduler). func (w *Workers) Stop() { tryUntil("stopping scheduler", 5, w.Scheduler.Stop) + tryUntil("stopping delivery workerpool", 5, w.Delivery.Stop) tryUntil("stopping client API workerpool", 5, w.ClientAPI.Stop) tryUntil("stopping federator workerpool", 5, w.Federator.Stop) tryUntil("stopping media workerpool", 5, w.Media.Stop) |