Merge pull request #247 from codebender/reorg_sidekiq_queues_422

Split up Sidekiq work across more specific queues. #422
coderwall · Nov 25, 2014 · 8b75c52 · 8b75c52
2 parents 9035ebf + d057062
commit 8b75c52
Show file tree

Hide file tree

Showing 86 changed files with 467 additions and 66 deletions.
diff --git a/app/jobs/analyze_spam_job.rb b/app/jobs/analyze_spam_job.rb
@@ -1,7 +1,7 @@
 class AnalyzeSpamJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :medium
+  sidekiq_options queue: :data_cleanup
 
   def perform(spammable)
     return if Rails.env.test? || Rails.env.development?

diff --git a/app/jobs/assign_networks_job.rb b/app/jobs/assign_networks_job.rb
@@ -1,7 +1,7 @@
 class AssignNetworksJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :network
 
   def perform(username)
     user = User.find_by_username(username)
@@ -11,4 +11,4 @@ def perform(username)
       end
     end
   end
-end
+end
diff --git a/app/jobs/award_job.rb b/app/jobs/award_job.rb
@@ -2,9 +2,9 @@ class AwardJob
   include Sidekiq::Worker
   include Awards
 
-  sidekiq_options queue: :high
+  sidekiq_options queue: :user
 
   def perform(badge, date, provider, candidate)
     award(badge.constantize, date, provider, candidate)
   end
-end
+end
diff --git a/app/jobs/award_user_job.rb b/app/jobs/award_user_job.rb
@@ -1,7 +1,7 @@
 class AwardUserJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :user
 
   def perform(username, badges)
     user = User.with_username(username)

diff --git a/app/jobs/build_activity_stream_job.rb b/app/jobs/build_activity_stream_job.rb
@@ -1,7 +1,7 @@
 class BuildActivityStreamJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :medium
+  sidekiq_options queue: :timeline
 
   def perform(username)
     user = User.with_username(username)

diff --git a/app/jobs/cleanup_protips_associate_zombie_upvotes_job.rb b/app/jobs/cleanup_protips_associate_zombie_upvotes_job.rb
@@ -1,7 +1,7 @@
 class CleanupProtipsAssociateZombieUpvotesJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :data_cleanup
 
   def perform
     Like.joins('inner join users on users.tracking_code = likes.tracking_code').

diff --git a/app/jobs/clear_expired_sessions_job.rb b/app/jobs/clear_expired_sessions_job.rb
@@ -1,7 +1,7 @@
 class ClearExpiredSessionsJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :data_cleanup
 
   def perform
     ActiveRecord::SessionStore::Session.delete_all(["updated_at < ?", 7.days.ago])

diff --git a/app/jobs/create_github_profile_job.rb b/app/jobs/create_github_profile_job.rb
@@ -2,11 +2,11 @@
 
 class CreateGithubProfileJob
   include Sidekiq::Worker
-  sidekiq_options queue: :low
+  sidekiq_options queue: :github
 
   def perform
     User.where('github is not null').find_each  do |user|
       user.create_github_profile if user.github_profile.blank?
     end
   end
-end
+end
diff --git a/app/jobs/create_network_job.rb b/app/jobs/create_network_job.rb
@@ -1,7 +1,7 @@
 class CreateNetworkJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :network
 
   def perform(tag)
     top_tags = Protip.trending_topics
@@ -13,4 +13,4 @@ def perform(tag)
       Network.create(name: tag, tags: sub_tags)
     end
   end
-end
+end
diff --git a/app/jobs/deactivate_team_jobs_job.rb b/app/jobs/deactivate_team_jobs_job.rb
@@ -1,7 +1,7 @@
 class DeactivateTeamJobsJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :team
 
   def perform(id)
     team = Team.find(id)

diff --git a/app/jobs/extract_github_profile.rb b/app/jobs/extract_github_profile.rb
@@ -1,6 +1,6 @@
 class ExtractGithubProfile
   include Sidekiq::Worker
-  sidekiq_options queue: :low
+  sidekiq_options queue: :github
 
 
   def perform(id)
@@ -40,4 +40,4 @@ def perform(id)
     end
   end
 
-end
+end
diff --git a/app/jobs/generate_event_job.rb b/app/jobs/generate_event_job.rb
@@ -2,7 +2,7 @@
 class GenerateEventJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :high
+  sidekiq_options queue: :event_publisher
 
   def perform(event_type, audience, data, drip_rate=:immediately)
     data = HashWithIndifferentAccess.new(data)
@@ -22,4 +22,4 @@ def event_still_valid?(event_type, data)
       true
     end
   end
-end
+end
diff --git a/app/jobs/generate_top_users_composite_job.rb b/app/jobs/generate_top_users_composite_job.rb
@@ -3,6 +3,8 @@
 class GenerateTopUsersCompositeJob
   include Sidekiq::Worker
 
+  sidekiq_options queue: :user
+
   IMAGE_PATH = Rails.root.join('public', 'images', 'top')
   WALL_IMAGE = IMAGE_PATH.join("wall.png")
 

diff --git a/app/jobs/geolocate_job.rb b/app/jobs/geolocate_job.rb
@@ -1,12 +1,12 @@
 class GeolocateJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :user
 
   def perform
     User.active.not_geocoded.each do |user|
       user.geocode_location
       user.save!
     end
   end
-end
+end
diff --git a/app/jobs/github_badge_org_job.rb b/app/jobs/github_badge_org_job.rb
@@ -1,7 +1,7 @@
 class GithubBadgeOrgJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :medium
+  sidekiq_options queue: :github
 
   def perform(username, action)
     user = User.with_username(username)

diff --git a/app/jobs/hawt_service_job.rb b/app/jobs/hawt_service_job.rb
@@ -1,7 +1,7 @@
 class HawtServiceJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :medium
+  sidekiq_options queue: :protip
 
   def perform(id, action)
     return '{}' unless Rails.env.production?
@@ -24,4 +24,4 @@ def protip_hash
   end
 
 
-end
+end
diff --git a/app/jobs/import_protip_job.rb b/app/jobs/import_protip_job.rb
@@ -1,7 +1,7 @@
-class ImportProtip
+class ImportProtipJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :protip
 
   def perform(type, arg1)
     case type
@@ -31,4 +31,4 @@ def autsubscribe_users(username)
       user.subscribe_to(speciality)
     end
   end
-end
+end
diff --git a/app/jobs/index_protip_job.rb b/app/jobs/index_protip_job.rb
@@ -1,7 +1,7 @@
 class IndexProtipJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :high
+  sidekiq_options queue: :index
 
   def perform(protip_id)
     protip = Protip.find(protip_id)

diff --git a/app/jobs/index_team_job.rb b/app/jobs/index_team_job.rb
@@ -1,10 +1,10 @@
 class IndexTeamJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :high
+  sidekiq_options queue: :index
 
   def perform(team_id)
     team = Team.find(team_id)
     team.tire.update_index
   end
-end
+end
diff --git a/app/jobs/merge_duplicate_link_job.rb b/app/jobs/merge_duplicate_link_job.rb
@@ -1,7 +1,7 @@
 class MergeDuplicateLinkJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :data_cleanup
 
   def perform(link)
     all_links = ProtipLink.where(url: link).order('created_at ASC')
@@ -16,4 +16,4 @@ def perform(link)
       end
     end
   end
-end
+end
diff --git a/app/jobs/merge_skill_job.rb b/app/jobs/merge_skill_job.rb
@@ -1,7 +1,7 @@
 class MergeSkillJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :data_cleanup
 
   def perform(incorrect_skill_id, correct_skill_name)
     incorrect_skill = Skill.find(incorrect_skill_id)
@@ -16,4 +16,4 @@ def perform(incorrect_skill_id, correct_skill_name)
       incorrect_skill.destroy
     end
   end
-end
+end
diff --git a/app/jobs/merge_tag_job.rb b/app/jobs/merge_tag_job.rb
@@ -1,12 +1,12 @@
 class MergeTagJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :data_cleanup
 
   def perform(good_tag_id, bad_tag_id)
     bad_taggings = Tagging.select(:id).where(tag_id: bad_tag_id)
     bad_taggings.find_each(batch_size: 1000) do |bad_tagging|
       MergeTaggingJob.perform_async(good_tag_id, bad_tagging.id)
     end
   end
-end
+end
diff --git a/app/jobs/merge_tagging_job.rb b/app/jobs/merge_tagging_job.rb
@@ -1,7 +1,7 @@
 class MergeTaggingJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :data_cleanup
 
   def perform(good_tag_id, bad_tagging_id)
     bad_tagging = Tagging.find(bad_tagging_id)
@@ -15,4 +15,4 @@ def perform(good_tag_id, bad_tagging_id)
       bad_tagging.destroy
     end
   end
-end
+end
diff --git a/app/jobs/process_like_job.rb b/app/jobs/process_like_job.rb
@@ -1,7 +1,7 @@
 class ProcessLikeJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :high
+  sidekiq_options queue: :user
 
   def perform(process_type, like_id)
     like = Like.find(like_id)

diff --git a/app/jobs/process_protip_job.rb b/app/jobs/process_protip_job.rb
@@ -1,7 +1,7 @@
 class ProcessProtipJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :protip
 
   def perform(process_type, protip_id)
     protip = Protip.find(protip_id)
@@ -17,4 +17,4 @@ def perform(process_type, protip_id)
         protip.save(validate: false)
     end
   end
-end
+end
diff --git a/app/jobs/process_team_job.rb b/app/jobs/process_team_job.rb
@@ -1,7 +1,7 @@
 class ProcessTeamJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :team
 
   def perform(process_type, team_id)
     team = Team.find(team_id)

diff --git a/app/jobs/protip_indexer_worker.rb b/app/jobs/protip_indexer_worker.rb
@@ -1,7 +1,7 @@
 class ProtipIndexerWorker
   include Sidekiq::Worker
 
-  sidekiq_options :queue =>  :high
+  sidekiq_options :queue =>  :index
 
   def perform(protip_id)
     protip = Protip.find(protip_id)

diff --git a/app/jobs/protips_recalculate_scores_job.rb b/app/jobs/protips_recalculate_scores_job.rb
@@ -1,7 +1,7 @@
 class ProtipsRecalculateScoresJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :low
+  sidekiq_options queue: :protip
 
   def perform
     Protip.where('created_at > ?', 25.hours.ago).where(upvotes_value_cache: nil).each do |protip|

diff --git a/app/jobs/refresh_timeline_job.rb b/app/jobs/refresh_timeline_job.rb
@@ -1,7 +1,7 @@
 class RefreshTimelineJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :medium
+  sidekiq_options queue: :timeline
 
   def perform(username)
     user = User.find_by_username(username)

diff --git a/app/jobs/refresh_user_job.rb b/app/jobs/refresh_user_job.rb
@@ -1,6 +1,6 @@
 class RefreshUserJob
   include Sidekiq::Worker
-  sidekiq_options queue: :low
+  sidekiq_options queue: :user
 
   def perform(user_id, full=false)
     return if Rails.env.test?

diff --git a/app/jobs/resize_tilt_shift_banner_job.rb b/app/jobs/resize_tilt_shift_banner_job.rb
@@ -1,7 +1,7 @@
 class ResizeTiltShiftBannerJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :high
+  sidekiq_options queue: :user
 
   def perform(klass, id, column)
     image = klass.constantize.find(id)
@@ -11,4 +11,4 @@ def perform(klass, id, column)
       image.save!
     end
   end
-end
+end
diff --git a/app/jobs/reverse_geolocate_user_job.rb b/app/jobs/reverse_geolocate_user_job.rb
@@ -4,7 +4,7 @@ class ReverseGeolocateUserJob
   include Sidekiq::Worker
   include ReverseGeocoder
 
-  sidekiq_options queue: :high
+  sidekiq_options queue: :user
 
   def perform(username, ip_address)
     user = User.find_by_username(username)
@@ -25,4 +25,4 @@ def perform(username, ip_address)
       end
     end
   end
-end
+end