erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge 9778204e5d into a50c8e951f

Browse source
This commit is contained in:
Shlee 2024-07-31 14:07:08 +00:00 committed by GitHub
commit b82a547ab3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/workers/activitypub/low_priority_delivery_worker.rb
View file

@ -1,5 +1,5 @@
# frozen_string_literal: true # frozen_string_literal: true
class ActivityPub::LowPriorityDeliveryWorker < ActivityPub::DeliveryWorker class ActivityPub::LowPriorityDeliveryWorker < ActivityPub::DeliveryWorker
sidekiq_options queue: 'pull', retry: 8, dead: false sidekiq_options queue: 'low_priority', retry: 8, dead: false
end end

4
app/workers/scheduler/suspended_user_cleanup_scheduler.rb
View file

@ -6,7 +6,7 @@ class Scheduler::SuspendedUserCleanupScheduler
# Each processed deletion request may enqueue an enormous # Each processed deletion request may enqueue an enormous
# amount of jobs in the `pull` queue, so only enqueue when # amount of jobs in the `pull` queue, so only enqueue when
# the queue is empty or close to being so. # the queue is empty or close to being so.
MAX_PULL_SIZE = 50 MAX_QUEUE_SIZE = 50
# Since account deletion is very expensive, we want to avoid # Since account deletion is very expensive, we want to avoid
# overloading the server by queuing too much at once. # overloading the server by queuing too much at once.
@ -19,7 +19,7 @@ class Scheduler::SuspendedUserCleanupScheduler
sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
def perform def perform
return if Sidekiq::Queue.new('pull').size > MAX_PULL_SIZE return if Sidekiq::Queue.new('low_priority').size > MAX_QUEUE_SIZE
process_deletion_requests! process_deletion_requests!
end end

5
config/sidekiq.yml
View file

@ -4,8 +4,9 @@
- [default, 8] - [default, 8]
- [push, 6] - [push, 6]
- [ingress, 4] - [ingress, 4]
- [mailers, 2] - [mailers, 3]
- [pull] - [pull, 2]
- [low_priority]
- [scheduler] - [scheduler]
:scheduler: :scheduler: