FEATURE: prioritize sidekiq jobs

This commit introduces 3 queues for sidekiq

"critical" for urgent jobs (weighted at 4x weight)
"default" for standard jobs(weighted at 2x weight)
"low" for less important jobs


"critical jobs"

Reset Password emails has been seperated to its own job
Heartbeat which is required to keep sidekiq running
Test email which needs to return real quick


"low priority jobs"

Notify mailing list
Pull hotlinked images
Update gravatar

"default"

All the rest

Note: for people running sidekiq from command line use

bin/sidekiq -q critical,4 -q default,2 -q low
This commit is contained in:
Sam
2016-04-07 12:56:43 +10:00
parent a5d8dfb07e
commit 8ec7fd84fd
10 changed files with 28 additions and 4 deletions
+14
View File
@@ -0,0 +1,14 @@
# base.rb uses this style of require, so maintain usage of it here
require_dependency "#{Rails.root}/app/jobs/regular/user_email.rb"
module Jobs
class ForgotPassword < UserEmail
sidekiq_options queue: 'critical'
def execute(args)
args[:type] = :forgot_password
super(args)
end
end
end
@@ -2,6 +2,8 @@ module Jobs
class NotifyMailingListSubscribers < Jobs::Base
sidekiq_options queue: 'low'
def execute(args)
return if SiteSetting.disable_mailing_list_mode
@@ -4,6 +4,9 @@ require_dependency 'file_helper'
module Jobs
class PullHotlinkedImages < Jobs::Base
sidekiq_options queue: 'low'
def initialize
# maximum size of the file in bytes
@max_size = SiteSetting.max_image_size_kb.kilobytes
+2
View File
@@ -1,6 +1,8 @@
module Jobs
class RunHeartbeat < Jobs::Base
sidekiq_options queue: 'critical'
def self.heartbeat_key
'heartbeat_last_run'
end
+2
View File
@@ -5,6 +5,8 @@ module Jobs
# Asynchronously send an email
class TestEmail < Jobs::Base
sidekiq_options queue: 'critical'
def execute(args)
raise Discourse::InvalidParameters.new(:to_address) unless args[:to_address].present?
+2
View File
@@ -2,6 +2,8 @@ module Jobs
class UpdateGravatar < Jobs::Base
sidekiq_options queue: 'low'
def execute(args)
user = User.find_by(id: args[:user_id])
avatar = UserAvatar.find_by(id: args[:avatar_id])