Skip to content

Commit 8b75c52

Browse files
just3wsjust3ws
committed
Merge pull request coderwall#247 from codebender/reorg_sidekiq_queues_422
Split up Sidekiq work across more specific queues. #422
2 parents 9035ebf + d057062 commit 8b75c52

File tree

86 files changed

+467
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+467
-66
lines changed

‎app/jobs/analyze_spam_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class AnalyzeSpamJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :medium
4+
sidekiq_options queue: :data_cleanup
55

66
def perform(spammable)
77
return if Rails.env.test? || Rails.env.development?

‎app/jobs/assign_networks_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class AssignNetworksJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :network
55

66
def perform(username)
77
user = User.find_by_username(username)
@@ -11,4 +11,4 @@ def perform(username)
1111
end
1212
end
1313
end
14-
end
14+
end

‎app/jobs/award_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ class AwardJob
22
include Sidekiq::Worker
33
include Awards
44

5-
sidekiq_options queue: :high
5+
sidekiq_options queue: :user
66

77
def perform(badge, date, provider, candidate)
88
award(badge.constantize, date, provider, candidate)
99
end
10-
end
10+
end

‎app/jobs/award_user_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class AwardUserJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :user
55

66
def perform(username, badges)
77
user = User.with_username(username)

‎app/jobs/build_activity_stream_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class BuildActivityStreamJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :medium
4+
sidekiq_options queue: :timeline
55

66
def perform(username)
77
user = User.with_username(username)

‎app/jobs/cleanup_protips_associate_zombie_upvotes_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class CleanupProtipsAssociateZombieUpvotesJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :data_cleanup
55

66
def perform
77
Like.joins('inner join users on users.tracking_code = likes.tracking_code').

‎app/jobs/clear_expired_sessions_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ClearExpiredSessionsJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :data_cleanup
55

66
def perform
77
ActiveRecord::SessionStore::Session.delete_all(["updated_at < ?", 7.days.ago])

‎app/jobs/create_github_profile_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
class CreateGithubProfileJob
44
include Sidekiq::Worker
5-
sidekiq_options queue: :low
5+
sidekiq_options queue: :github
66

77
def perform
88
User.where('github is not null').find_each do |user|
99
user.create_github_profile if user.github_profile.blank?
1010
end
1111
end
12-
end
12+
end

‎app/jobs/create_network_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class CreateNetworkJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :network
55

66
def perform(tag)
77
top_tags = Protip.trending_topics
@@ -13,4 +13,4 @@ def perform(tag)
1313
Network.create(name: tag, tags: sub_tags)
1414
end
1515
end
16-
end
16+
end

‎app/jobs/deactivate_team_jobs_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class DeactivateTeamJobsJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :team
55

66
def perform(id)
77
team = Team.find(id)

‎app/jobs/extract_github_profile.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class ExtractGithubProfile
22
include Sidekiq::Worker
3-
sidekiq_options queue: :low
3+
sidekiq_options queue: :github
44

55

66
def perform(id)
@@ -40,4 +40,4 @@ def perform(id)
4040
end
4141
end
4242

43-
end
43+
end

‎app/jobs/generate_event_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
class GenerateEventJob
33
include Sidekiq::Worker
44

5-
sidekiq_options queue: :high
5+
sidekiq_options queue: :event_publisher
66

77
def perform(event_type, audience, data, drip_rate=:immediately)
88
data = HashWithIndifferentAccess.new(data)
@@ -22,4 +22,4 @@ def event_still_valid?(event_type, data)
2222
true
2323
end
2424
end
25-
end
25+
end

‎app/jobs/generate_top_users_composite_job.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
class GenerateTopUsersCompositeJob
44
include Sidekiq::Worker
55

6+
sidekiq_options queue: :user
7+
68
IMAGE_PATH = Rails.root.join('public', 'images', 'top')
79
WALL_IMAGE = IMAGE_PATH.join("wall.png")
810

‎app/jobs/geolocate_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
class GeolocateJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :user
55

66
def perform
77
User.active.not_geocoded.each do |user|
88
user.geocode_location
99
user.save!
1010
end
1111
end
12-
end
12+
end

‎app/jobs/github_badge_org_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class GithubBadgeOrgJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :medium
4+
sidekiq_options queue: :github
55

66
def perform(username, action)
77
user = User.with_username(username)

‎app/jobs/hawt_service_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class HawtServiceJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :medium
4+
sidekiq_options queue: :protip
55

66
def perform(id, action)
77
return '{}' unless Rails.env.production?
@@ -24,4 +24,4 @@ def protip_hash
2424
end
2525

2626

27-
end
27+
end

‎app/jobs/import_protip_job.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
class ImportProtip
1+
class ImportProtipJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :protip
55

66
def perform(type, arg1)
77
case type
@@ -31,4 +31,4 @@ def autsubscribe_users(username)
3131
user.subscribe_to(speciality)
3232
end
3333
end
34-
end
34+
end

‎app/jobs/index_protip_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class IndexProtipJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :high
4+
sidekiq_options queue: :index
55

66
def perform(protip_id)
77
protip = Protip.find(protip_id)

‎app/jobs/index_team_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
class IndexTeamJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :high
4+
sidekiq_options queue: :index
55

66
def perform(team_id)
77
team = Team.find(team_id)
88
team.tire.update_index
99
end
10-
end
10+
end

‎app/jobs/merge_duplicate_link_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class MergeDuplicateLinkJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :data_cleanup
55

66
def perform(link)
77
all_links = ProtipLink.where(url: link).order('created_at ASC')
@@ -16,4 +16,4 @@ def perform(link)
1616
end
1717
end
1818
end
19-
end
19+
end

‎app/jobs/merge_skill_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class MergeSkillJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :data_cleanup
55

66
def perform(incorrect_skill_id, correct_skill_name)
77
incorrect_skill = Skill.find(incorrect_skill_id)
@@ -16,4 +16,4 @@ def perform(incorrect_skill_id, correct_skill_name)
1616
incorrect_skill.destroy
1717
end
1818
end
19-
end
19+
end

‎app/jobs/merge_tag_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
class MergeTagJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :data_cleanup
55

66
def perform(good_tag_id, bad_tag_id)
77
bad_taggings = Tagging.select(:id).where(tag_id: bad_tag_id)
88
bad_taggings.find_each(batch_size: 1000) do |bad_tagging|
99
MergeTaggingJob.perform_async(good_tag_id, bad_tagging.id)
1010
end
1111
end
12-
end
12+
end

‎app/jobs/merge_tagging_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class MergeTaggingJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :data_cleanup
55

66
def perform(good_tag_id, bad_tagging_id)
77
bad_tagging = Tagging.find(bad_tagging_id)
@@ -15,4 +15,4 @@ def perform(good_tag_id, bad_tagging_id)
1515
bad_tagging.destroy
1616
end
1717
end
18-
end
18+
end

‎app/jobs/process_like_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ProcessLikeJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :high
4+
sidekiq_options queue: :user
55

66
def perform(process_type, like_id)
77
like = Like.find(like_id)

‎app/jobs/process_protip_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ProcessProtipJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :protip
55

66
def perform(process_type, protip_id)
77
protip = Protip.find(protip_id)
@@ -17,4 +17,4 @@ def perform(process_type, protip_id)
1717
protip.save(validate: false)
1818
end
1919
end
20-
end
20+
end

‎app/jobs/process_team_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ProcessTeamJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :team
55

66
def perform(process_type, team_id)
77
team = Team.find(team_id)

‎app/jobs/protip_indexer_worker.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ProtipIndexerWorker
22
include Sidekiq::Worker
33

4-
sidekiq_options :queue => :high
4+
sidekiq_options :queue => :index
55

66
def perform(protip_id)
77
protip = Protip.find(protip_id)

‎app/jobs/protips_recalculate_scores_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ProtipsRecalculateScoresJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :low
4+
sidekiq_options queue: :protip
55

66
def perform
77
Protip.where('created_at > ?', 25.hours.ago).where(upvotes_value_cache: nil).each do |protip|

‎app/jobs/refresh_timeline_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class RefreshTimelineJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :medium
4+
sidekiq_options queue: :timeline
55

66
def perform(username)
77
user = User.find_by_username(username)

‎app/jobs/refresh_user_job.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class RefreshUserJob
22
include Sidekiq::Worker
3-
sidekiq_options queue: :low
3+
sidekiq_options queue: :user
44

55
def perform(user_id, full=false)
66
return if Rails.env.test?

‎app/jobs/resize_tilt_shift_banner_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ResizeTiltShiftBannerJob
22
include Sidekiq::Worker
33

4-
sidekiq_options queue: :high
4+
sidekiq_options queue: :user
55

66
def perform(klass, id, column)
77
image = klass.constantize.find(id)
@@ -11,4 +11,4 @@ def perform(klass, id, column)
1111
image.save!
1212
end
1313
end
14-
end
14+
end

‎app/jobs/reverse_geolocate_user_job.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class ReverseGeolocateUserJob
44
include Sidekiq::Worker
55
include ReverseGeocoder
66

7-
sidekiq_options queue: :high
7+
sidekiq_options queue: :user
88

99
def perform(username, ip_address)
1010
user = User.find_by_username(username)
@@ -25,4 +25,4 @@ def perform(username, ip_address)
2525
end
2626
end
2727
end
28-
end
28+
end

0 commit comments

Comments
 (0)