From d057062761b3007fa125983dd672a20b44da8507 Mon Sep 17 00:00:00 2001 From: Matthew Bender Date: Sun, 16 Nov 2014 13:41:11 -0700 Subject: [PATCH] organize sidekiq jobs into logical queue names https://assembly.com/coderwall/bounties/422 SearchSyncJob must use search_sync queue for uniqueness SearchSyncJob depends on its queue being its own queue, because that is how it enforces uniqueness --- app/jobs/analyze_spam_job.rb | 2 +- app/jobs/assign_networks_job.rb | 4 ++-- app/jobs/award_job.rb | 4 ++-- app/jobs/award_user_job.rb | 2 +- app/jobs/build_activity_stream_job.rb | 2 +- ...leanup_protips_associate_zombie_upvotes_job.rb | 2 +- app/jobs/clear_expired_sessions_job.rb | 2 +- app/jobs/create_github_profile_job.rb | 4 ++-- app/jobs/create_network_job.rb | 4 ++-- app/jobs/deactivate_team_jobs_job.rb | 2 +- app/jobs/extract_github_profile.rb | 4 ++-- app/jobs/generate_event_job.rb | 4 ++-- app/jobs/generate_top_users_composite_job.rb | 2 ++ app/jobs/geolocate_job.rb | 4 ++-- app/jobs/github_badge_org_job.rb | 2 +- app/jobs/hawt_service_job.rb | 4 ++-- app/jobs/import_protip_job.rb | 6 +++--- app/jobs/index_protip_job.rb | 2 +- app/jobs/index_team_job.rb | 4 ++-- app/jobs/merge_duplicate_link_job.rb | 4 ++-- app/jobs/merge_skill_job.rb | 4 ++-- app/jobs/merge_tag_job.rb | 4 ++-- app/jobs/merge_tagging_job.rb | 4 ++-- app/jobs/process_like_job.rb | 2 +- app/jobs/process_protip_job.rb | 4 ++-- app/jobs/process_team_job.rb | 2 +- app/jobs/protip_indexer_worker.rb | 2 +- app/jobs/protips_recalculate_scores_job.rb | 2 +- app/jobs/refresh_timeline_job.rb | 2 +- app/jobs/refresh_user_job.rb | 2 +- app/jobs/resize_tilt_shift_banner_job.rb | 4 ++-- app/jobs/reverse_geolocate_user_job.rb | 4 ++-- app/jobs/seed_github_protips_job.rb | 2 +- app/jobs/teams_refresh_job.rb | 2 +- app/jobs/track_event_job.rb | 2 +- app/jobs/update_network_job.rb | 4 ++-- app/workers/activate_pending_users_worker.rb | 2 +- .../protip_mailer_popular_protips_send_worker.rb | 2 +- .../protip_mailer_popular_protips_worker.rb | 2 +- app/workers/refresh_stale_users_worker.rb | 2 +- app/workers/sitemap_refresh_worker.rb | 2 +- app/workers/user_activate_worker.rb | 2 +- config/sidekiq.yml | 11 +++++++++++ ...lyze_spam_spec.rb => analyze_spam_job_spec.rb} | 15 ++++++++++++--- spec/jobs/assign_networks_job_spec.rb | 9 +++++++++ spec/jobs/award_job_spec.rb | 9 +++++++++ spec/jobs/award_user_job_spec.rb | 9 +++++++++ spec/jobs/build_activity_stream_job_spec.rb | 10 ++++++++++ ...p_protips_associate_zombie_upvotes_job_spec.rb | 10 ++++++++++ spec/jobs/clear_expired_sessions_job_spec.rb | 10 ++++++++++ spec/jobs/create_github_profile_job_spec.rb | 9 +++++++++ spec/jobs/create_network_job_spec.rb | 9 +++++++++ spec/jobs/deactivate_team_jobs_job_spec.rb | 9 +++++++++ spec/jobs/extract_github_profile_spec.rb | 9 +++++++++ spec/jobs/generate_event_job_spec.rb | 10 ++++++++++ .../jobs/generate_top_users_composite_job_spec.rb | 10 ++++++++++ spec/jobs/geolocate_job_spec.rb | 9 +++++++++ spec/jobs/github_badge_org_job_spec.rb | 9 +++++++++ spec/jobs/hawt_service_job_spec.rb | 9 +++++++++ spec/jobs/import_protip_job_spec.rb | 9 +++++++++ spec/jobs/index_protip_job_spec.rb | 9 +++++++++ spec/jobs/index_team_job_spec.rb | 9 +++++++++ spec/jobs/merge_duplicate_link_job_spec.rb | 10 ++++++++++ spec/jobs/merge_skill_job_spec.rb | 9 +++++++++ spec/jobs/merge_tag_job_spec.rb | 9 +++++++++ spec/jobs/merge_tagging_job_spec.rb | 9 +++++++++ spec/jobs/process_like_job_spec.rb | 9 +++++++++ spec/jobs/process_protip_job_spec.rb | 9 +++++++++ spec/jobs/process_team_job_spec.rb | 9 +++++++++ spec/jobs/protip_indexer_worker_spec.rb | 9 +++++++++ spec/jobs/protips_recalculate_scores_job_spec.rb | 10 ++++++++++ spec/jobs/refresh_timeline_job_spec.rb | 10 ++++++++++ spec/jobs/refresh_user_job_spec.rb | 9 +++++++++ spec/jobs/resize_tilt_shift_banner_job_spec.rb | 9 +++++++++ spec/jobs/reverse_geolocate_user_job_spec.rb | 9 +++++++++ spec/jobs/search_sync_job_spec.rb | 9 +++++++++ spec/jobs/seed_github_protips_job_spec.rb | 9 +++++++++ spec/jobs/teams_refresh_job_spec.rb | 9 +++++++++ spec/jobs/track_event_job_spec.rb | 9 +++++++++ spec/jobs/update_network_job_spec.rb | 9 +++++++++ .../workers/activate_pending_users_worker_spec.rb | 9 ++++++--- ...tip_mailer_popular_protips_send_worker_spec.rb | 10 ++++++++++ .../protip_mailer_popular_protips_worker_spec.rb | 10 ++++++++++ spec/workers/refresh_stale_users_worker_spec.rb | 9 +++++++++ spec/workers/sitemap_refresh_worker_spec.rb | 9 +++++++++ spec/workers/user_activate_worker_spec.rb | 6 ++++++ 86 files changed, 467 insertions(+), 66 deletions(-) rename spec/jobs/{analyze_spam_spec.rb => analyze_spam_job_spec.rb} (75%) create mode 100644 spec/jobs/assign_networks_job_spec.rb create mode 100644 spec/jobs/award_job_spec.rb create mode 100644 spec/jobs/award_user_job_spec.rb create mode 100644 spec/jobs/build_activity_stream_job_spec.rb create mode 100644 spec/jobs/cleanup_protips_associate_zombie_upvotes_job_spec.rb create mode 100644 spec/jobs/clear_expired_sessions_job_spec.rb create mode 100644 spec/jobs/create_github_profile_job_spec.rb create mode 100644 spec/jobs/create_network_job_spec.rb create mode 100644 spec/jobs/deactivate_team_jobs_job_spec.rb create mode 100644 spec/jobs/extract_github_profile_spec.rb create mode 100644 spec/jobs/generate_event_job_spec.rb create mode 100644 spec/jobs/generate_top_users_composite_job_spec.rb create mode 100644 spec/jobs/geolocate_job_spec.rb create mode 100644 spec/jobs/github_badge_org_job_spec.rb create mode 100644 spec/jobs/hawt_service_job_spec.rb create mode 100644 spec/jobs/import_protip_job_spec.rb create mode 100644 spec/jobs/index_protip_job_spec.rb create mode 100644 spec/jobs/index_team_job_spec.rb create mode 100644 spec/jobs/merge_duplicate_link_job_spec.rb create mode 100644 spec/jobs/merge_skill_job_spec.rb create mode 100644 spec/jobs/merge_tag_job_spec.rb create mode 100644 spec/jobs/merge_tagging_job_spec.rb create mode 100644 spec/jobs/process_like_job_spec.rb create mode 100644 spec/jobs/process_protip_job_spec.rb create mode 100644 spec/jobs/process_team_job_spec.rb create mode 100644 spec/jobs/protip_indexer_worker_spec.rb create mode 100644 spec/jobs/protips_recalculate_scores_job_spec.rb create mode 100644 spec/jobs/refresh_timeline_job_spec.rb create mode 100644 spec/jobs/refresh_user_job_spec.rb create mode 100644 spec/jobs/resize_tilt_shift_banner_job_spec.rb create mode 100644 spec/jobs/reverse_geolocate_user_job_spec.rb create mode 100644 spec/jobs/search_sync_job_spec.rb create mode 100644 spec/jobs/seed_github_protips_job_spec.rb create mode 100644 spec/jobs/teams_refresh_job_spec.rb create mode 100644 spec/jobs/track_event_job_spec.rb create mode 100644 spec/jobs/update_network_job_spec.rb create mode 100644 spec/workers/protip_mailer_popular_protips_send_worker_spec.rb create mode 100644 spec/workers/protip_mailer_popular_protips_worker_spec.rb create mode 100644 spec/workers/refresh_stale_users_worker_spec.rb create mode 100644 spec/workers/sitemap_refresh_worker_spec.rb diff --git a/app/jobs/analyze_spam_job.rb b/app/jobs/analyze_spam_job.rb index 4959e5bc..94689762 100644 --- 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 index 73ad9d2a..d0aee647 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/award_job.rb b/app/jobs/award_job.rb index 30a3f9a1..c74f9ca8 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/award_user_job.rb b/app/jobs/award_user_job.rb index 1ccc66dc..79f4ee04 100644 --- 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 index 7cceedc1..ce8d336d 100644 --- 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 index b525fd6e..9b3c74a0 100644 --- 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 index 7ff85816..bde26fcb 100644 --- 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 index 251db3ca..4c17bb15 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/create_network_job.rb b/app/jobs/create_network_job.rb index 2c2ffa7d..945fafe8 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/deactivate_team_jobs_job.rb b/app/jobs/deactivate_team_jobs_job.rb index 128afb50..e2511bde 100644 --- 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 index d904e9e2..bedcc8a2 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/generate_event_job.rb b/app/jobs/generate_event_job.rb index aaa1304f..b9acf7c4 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/generate_top_users_composite_job.rb b/app/jobs/generate_top_users_composite_job.rb index 698dc23b..602a1cc8 100644 --- 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 index 2759c0eb..cb210ff6 100644 --- a/app/jobs/geolocate_job.rb +++ b/app/jobs/geolocate_job.rb @@ -1,7 +1,7 @@ class GeolocateJob include Sidekiq::Worker - sidekiq_options queue: :low + sidekiq_options queue: :user def perform User.active.not_geocoded.each do |user| @@ -9,4 +9,4 @@ def perform user.save! end end -end \ No newline at end of file +end diff --git a/app/jobs/github_badge_org_job.rb b/app/jobs/github_badge_org_job.rb index 1ed4caf6..31b247f5 100644 --- 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 index 2eb22c62..d097a383 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/import_protip_job.rb b/app/jobs/import_protip_job.rb index 7b87f7e2..64f16064 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/index_protip_job.rb b/app/jobs/index_protip_job.rb index b3ee8fa5..b4087277 100644 --- 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 index 1ac047a2..e4e14757 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/merge_duplicate_link_job.rb b/app/jobs/merge_duplicate_link_job.rb index c8b1fab4..2c58f02f 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/merge_skill_job.rb b/app/jobs/merge_skill_job.rb index 0d98363c..914d88bc 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/merge_tag_job.rb b/app/jobs/merge_tag_job.rb index d01838c4..f4d59c4d 100644 --- a/app/jobs/merge_tag_job.rb +++ b/app/jobs/merge_tag_job.rb @@ -1,7 +1,7 @@ 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) @@ -9,4 +9,4 @@ def perform(good_tag_id, bad_tag_id) MergeTaggingJob.perform_async(good_tag_id, bad_tagging.id) end end -end \ No newline at end of file +end diff --git a/app/jobs/merge_tagging_job.rb b/app/jobs/merge_tagging_job.rb index d68dc718..2aa4f89e 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/process_like_job.rb b/app/jobs/process_like_job.rb index a63d85a4..db312275 100644 --- 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 index d76c0907..08d6bc6a 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/process_team_job.rb b/app/jobs/process_team_job.rb index 5cb40cc9..7b022db3 100644 --- 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 index a1f4ed40..456f366c 100644 --- 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 index 8fa2fe1c..fa118112 100644 --- 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 index e305c351..b4fcb1a8 100644 --- 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 index ec3be88c..8f03cc0f 100644 --- 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 index 36bca41b..d51fa27b 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/reverse_geolocate_user_job.rb b/app/jobs/reverse_geolocate_user_job.rb index 13273164..3fad13bb 100644 --- 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 \ No newline at end of file +end diff --git a/app/jobs/seed_github_protips_job.rb b/app/jobs/seed_github_protips_job.rb index 8b904231..3b1edf5f 100644 --- a/app/jobs/seed_github_protips_job.rb +++ b/app/jobs/seed_github_protips_job.rb @@ -1,7 +1,7 @@ class SeedGithubProtipsJob include Sidekiq::Worker - sidekiq_options queue: :low + sidekiq_options queue: :github def perform(username) user = User.with_username(username) diff --git a/app/jobs/teams_refresh_job.rb b/app/jobs/teams_refresh_job.rb index 0ad189d7..3ebdcaf3 100644 --- a/app/jobs/teams_refresh_job.rb +++ b/app/jobs/teams_refresh_job.rb @@ -1,7 +1,7 @@ class TeamsRefreshJob include Sidekiq::Worker - sidekiq_options queue: :low + sidekiq_options queue: :team def perform Team.all.each do |team| diff --git a/app/jobs/track_event_job.rb b/app/jobs/track_event_job.rb index 8de089a1..c4702f8b 100644 --- a/app/jobs/track_event_job.rb +++ b/app/jobs/track_event_job.rb @@ -1,7 +1,7 @@ class TrackEventJob include Sidekiq::Worker - sidekiq_options queue: :critical + sidekiq_options queue: :event_tracker def perform(name, params, request_ip) mixpanel(request_ip).track(name, params) diff --git a/app/jobs/update_network_job.rb b/app/jobs/update_network_job.rb index bf9fb5e8..cdf2ac91 100644 --- a/app/jobs/update_network_job.rb +++ b/app/jobs/update_network_job.rb @@ -3,7 +3,7 @@ class UpdateNetworkJob #OPTIMIZE include Sidekiq::Worker - sidekiq_options queue: :high + sidekiq_options queue: :network def perform(update_type, public_id, data) protip = Protip.with_public_id(public_id) @@ -21,4 +21,4 @@ def perform(update_type, public_id, data) end end end -end \ No newline at end of file +end diff --git a/app/workers/activate_pending_users_worker.rb b/app/workers/activate_pending_users_worker.rb index 5010ffaa..f18b6fbf 100644 --- a/app/workers/activate_pending_users_worker.rb +++ b/app/workers/activate_pending_users_worker.rb @@ -1,6 +1,6 @@ class ActivatePendingUsersWorker include Sidekiq::Worker - sidekiq_options queue: :critical + sidekiq_options queue: :user def perform # Spawning possibly many thousands diff --git a/app/workers/protip_mailer_popular_protips_send_worker.rb b/app/workers/protip_mailer_popular_protips_send_worker.rb index ae560a9a..7bbc5882 100644 --- a/app/workers/protip_mailer_popular_protips_send_worker.rb +++ b/app/workers/protip_mailer_popular_protips_send_worker.rb @@ -1,6 +1,6 @@ class ProtipMailerPopularProtipsSendWorker include Sidekiq::Worker - sidekiq_options queue: :low + sidekiq_options queue: :mailer def perform(user_id, protip_ids, from, to) fail "Only #{protip_ids.count} protips but expected 10" unless protip_ids.count == 10 diff --git a/app/workers/protip_mailer_popular_protips_worker.rb b/app/workers/protip_mailer_popular_protips_worker.rb index 478741a3..8d26d146 100644 --- a/app/workers/protip_mailer_popular_protips_worker.rb +++ b/app/workers/protip_mailer_popular_protips_worker.rb @@ -1,6 +1,6 @@ class ProtipMailerPopularProtipsWorker include Sidekiq::Worker - sidekiq_options queue: :low + sidekiq_options queue: :mailer def perform(from, to) diff --git a/app/workers/refresh_stale_users_worker.rb b/app/workers/refresh_stale_users_worker.rb index 737e281d..06a3adab 100644 --- a/app/workers/refresh_stale_users_worker.rb +++ b/app/workers/refresh_stale_users_worker.rb @@ -1,6 +1,6 @@ class RefreshStaleUsersWorker include Sidekiq::Worker - sidekiq_options queue: :critical + sidekiq_options queue: :user def perform user_records.find_each(batch_size: 1000) do |user| diff --git a/app/workers/sitemap_refresh_worker.rb b/app/workers/sitemap_refresh_worker.rb index 26d93a7e..7b263225 100644 --- a/app/workers/sitemap_refresh_worker.rb +++ b/app/workers/sitemap_refresh_worker.rb @@ -1,7 +1,7 @@ class SitemapRefreshWorker include Sidekiq::Worker - sidekiq_options queue: :sitemap_generator + sidekiq_options queue: :index def perform # ArgumentError: Missing host to link to! Please provide the :host parameter, set default_path_options[:host], or set :only_path to true diff --git a/app/workers/user_activate_worker.rb b/app/workers/user_activate_worker.rb index d0b428cc..0625ea89 100644 --- a/app/workers/user_activate_worker.rb +++ b/app/workers/user_activate_worker.rb @@ -1,6 +1,6 @@ class UserActivateWorker include Sidekiq::Worker - sidekiq_options queue: :high + sidekiq_options queue: :user def perform(user_id) user = User.find(user_id) diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 588a75bb..aa0de469 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -5,6 +5,17 @@ staging: production: :concurrency: <%= ENV['SIDEKIQ_CONCURRENCY'] || 20 %> :queues: + - [event_tracker, 5] + - [index, 4] + - [timeline, 3] + - [user, 2] + - [data_cleanup, 1] + - [event_publisher, 1] + - [github, 1] + - [mailer, 1] + - [network, 1] + - [protip, 1] + - [team, 1] - [low, 1] - [default, 2] - [search_sync, 2] diff --git a/spec/jobs/analyze_spam_spec.rb b/spec/jobs/analyze_spam_job_spec.rb similarity index 75% rename from spec/jobs/analyze_spam_spec.rb rename to spec/jobs/analyze_spam_job_spec.rb index d8e10a05..f8b6ee59 100644 --- a/spec/jobs/analyze_spam_spec.rb +++ b/spec/jobs/analyze_spam_job_spec.rb @@ -1,5 +1,14 @@ -#FIXME -#RSpec.describe AnalyzeSpamJob, skip: true do +require 'sidekiq/testing' + +RSpec.describe AnalyzeSpamJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(AnalyzeSpamJob.get_sidekiq_options["queue"]).to eql :data_cleanup + end + end + +# TODO FIXME # describe '#perform' do # context 'when it is a spam' do # it 'should create a spam report' do @@ -19,4 +28,4 @@ # end # end # end -#end +end diff --git a/spec/jobs/assign_networks_job_spec.rb b/spec/jobs/assign_networks_job_spec.rb new file mode 100644 index 00000000..6ce491e9 --- /dev/null +++ b/spec/jobs/assign_networks_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe AssignNetworksJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(AssignNetworksJob.get_sidekiq_options["queue"]).to eql :network + end + end + +end diff --git a/spec/jobs/award_job_spec.rb b/spec/jobs/award_job_spec.rb new file mode 100644 index 00000000..9662ebde --- /dev/null +++ b/spec/jobs/award_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe AwardJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(AwardJob.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/jobs/award_user_job_spec.rb b/spec/jobs/award_user_job_spec.rb new file mode 100644 index 00000000..7151ba0a --- /dev/null +++ b/spec/jobs/award_user_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe AwardUserJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(AwardUserJob.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/jobs/build_activity_stream_job_spec.rb b/spec/jobs/build_activity_stream_job_spec.rb new file mode 100644 index 00000000..4da766ba --- /dev/null +++ b/spec/jobs/build_activity_stream_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe BuildActivityStreamJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(BuildActivityStreamJob.get_sidekiq_options["queue"]). + to eql :timeline + end + end + +end diff --git a/spec/jobs/cleanup_protips_associate_zombie_upvotes_job_spec.rb b/spec/jobs/cleanup_protips_associate_zombie_upvotes_job_spec.rb new file mode 100644 index 00000000..fbe30ce7 --- /dev/null +++ b/spec/jobs/cleanup_protips_associate_zombie_upvotes_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe CleanupProtipsAssociateZombieUpvotesJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(CleanupProtipsAssociateZombieUpvotesJob. + get_sidekiq_options["queue"]).to eql :data_cleanup + end + end + +end diff --git a/spec/jobs/clear_expired_sessions_job_spec.rb b/spec/jobs/clear_expired_sessions_job_spec.rb new file mode 100644 index 00000000..3723a6a7 --- /dev/null +++ b/spec/jobs/clear_expired_sessions_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe ClearExpiredSessionsJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ClearExpiredSessionsJob.get_sidekiq_options["queue"]). + to eql :data_cleanup + end + end + +end diff --git a/spec/jobs/create_github_profile_job_spec.rb b/spec/jobs/create_github_profile_job_spec.rb new file mode 100644 index 00000000..e5a3a14a --- /dev/null +++ b/spec/jobs/create_github_profile_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe CreateGithubProfileJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(CreateGithubProfileJob.get_sidekiq_options["queue"]).to eql :github + end + end + +end diff --git a/spec/jobs/create_network_job_spec.rb b/spec/jobs/create_network_job_spec.rb new file mode 100644 index 00000000..7cff502d --- /dev/null +++ b/spec/jobs/create_network_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe CreateNetworkJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(CreateNetworkJob.get_sidekiq_options["queue"]).to eql :network + end + end + +end diff --git a/spec/jobs/deactivate_team_jobs_job_spec.rb b/spec/jobs/deactivate_team_jobs_job_spec.rb new file mode 100644 index 00000000..91124c67 --- /dev/null +++ b/spec/jobs/deactivate_team_jobs_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe DeactivateTeamJobsJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(DeactivateTeamJobsJob.get_sidekiq_options["queue"]).to eql :team + end + end + +end diff --git a/spec/jobs/extract_github_profile_spec.rb b/spec/jobs/extract_github_profile_spec.rb new file mode 100644 index 00000000..461d46a4 --- /dev/null +++ b/spec/jobs/extract_github_profile_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ExtractGithubProfile do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ExtractGithubProfile.get_sidekiq_options["queue"]).to eql :github + end + end + +end diff --git a/spec/jobs/generate_event_job_spec.rb b/spec/jobs/generate_event_job_spec.rb new file mode 100644 index 00000000..6091adff --- /dev/null +++ b/spec/jobs/generate_event_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe GenerateEventJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(GenerateEventJob.get_sidekiq_options["queue"]). + to eql :event_publisher + end + end + +end diff --git a/spec/jobs/generate_top_users_composite_job_spec.rb b/spec/jobs/generate_top_users_composite_job_spec.rb new file mode 100644 index 00000000..9ec094d8 --- /dev/null +++ b/spec/jobs/generate_top_users_composite_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe GenerateTopUsersCompositeJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(GenerateTopUsersCompositeJob.get_sidekiq_options["queue"]). + to eql :user + end + end + +end diff --git a/spec/jobs/geolocate_job_spec.rb b/spec/jobs/geolocate_job_spec.rb new file mode 100644 index 00000000..10480185 --- /dev/null +++ b/spec/jobs/geolocate_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe GeolocateJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(GeolocateJob.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/jobs/github_badge_org_job_spec.rb b/spec/jobs/github_badge_org_job_spec.rb new file mode 100644 index 00000000..a345d0d6 --- /dev/null +++ b/spec/jobs/github_badge_org_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe GithubBadgeOrgJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(GithubBadgeOrgJob.get_sidekiq_options["queue"]).to eql :github + end + end + +end diff --git a/spec/jobs/hawt_service_job_spec.rb b/spec/jobs/hawt_service_job_spec.rb new file mode 100644 index 00000000..794f42d6 --- /dev/null +++ b/spec/jobs/hawt_service_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe HawtServiceJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(HawtServiceJob.get_sidekiq_options["queue"]).to eql :protip + end + end + +end diff --git a/spec/jobs/import_protip_job_spec.rb b/spec/jobs/import_protip_job_spec.rb new file mode 100644 index 00000000..7eee2d24 --- /dev/null +++ b/spec/jobs/import_protip_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ImportProtipJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ImportProtipJob.get_sidekiq_options["queue"]).to eql :protip + end + end + +end diff --git a/spec/jobs/index_protip_job_spec.rb b/spec/jobs/index_protip_job_spec.rb new file mode 100644 index 00000000..70afec80 --- /dev/null +++ b/spec/jobs/index_protip_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe IndexProtipJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(IndexProtipJob.get_sidekiq_options["queue"]).to eql :index + end + end + +end diff --git a/spec/jobs/index_team_job_spec.rb b/spec/jobs/index_team_job_spec.rb new file mode 100644 index 00000000..23b88e61 --- /dev/null +++ b/spec/jobs/index_team_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe IndexTeamJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(IndexTeamJob.get_sidekiq_options["queue"]).to eql :index + end + end + +end diff --git a/spec/jobs/merge_duplicate_link_job_spec.rb b/spec/jobs/merge_duplicate_link_job_spec.rb new file mode 100644 index 00000000..3a7afc40 --- /dev/null +++ b/spec/jobs/merge_duplicate_link_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe MergeDuplicateLinkJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(MergeDuplicateLinkJob.get_sidekiq_options["queue"]). + to eql :data_cleanup + end + end + +end diff --git a/spec/jobs/merge_skill_job_spec.rb b/spec/jobs/merge_skill_job_spec.rb new file mode 100644 index 00000000..75c25477 --- /dev/null +++ b/spec/jobs/merge_skill_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe MergeSkillJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(MergeSkillJob.get_sidekiq_options["queue"]).to eql :data_cleanup + end + end + +end diff --git a/spec/jobs/merge_tag_job_spec.rb b/spec/jobs/merge_tag_job_spec.rb new file mode 100644 index 00000000..e3c9a7b4 --- /dev/null +++ b/spec/jobs/merge_tag_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe MergeTagJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(MergeTagJob.get_sidekiq_options["queue"]).to eql :data_cleanup + end + end + +end diff --git a/spec/jobs/merge_tagging_job_spec.rb b/spec/jobs/merge_tagging_job_spec.rb new file mode 100644 index 00000000..1ff53112 --- /dev/null +++ b/spec/jobs/merge_tagging_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe MergeTaggingJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(MergeTaggingJob.get_sidekiq_options["queue"]).to eql :data_cleanup + end + end + +end diff --git a/spec/jobs/process_like_job_spec.rb b/spec/jobs/process_like_job_spec.rb new file mode 100644 index 00000000..d35135a9 --- /dev/null +++ b/spec/jobs/process_like_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ProcessLikeJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ProcessLikeJob.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/jobs/process_protip_job_spec.rb b/spec/jobs/process_protip_job_spec.rb new file mode 100644 index 00000000..93a93861 --- /dev/null +++ b/spec/jobs/process_protip_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ProcessProtipJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ProcessProtipJob.get_sidekiq_options["queue"]).to eql :protip + end + end + +end diff --git a/spec/jobs/process_team_job_spec.rb b/spec/jobs/process_team_job_spec.rb new file mode 100644 index 00000000..979271c3 --- /dev/null +++ b/spec/jobs/process_team_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ProcessTeamJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ProcessTeamJob.get_sidekiq_options["queue"]).to eql :team + end + end + +end diff --git a/spec/jobs/protip_indexer_worker_spec.rb b/spec/jobs/protip_indexer_worker_spec.rb new file mode 100644 index 00000000..5e00c5d5 --- /dev/null +++ b/spec/jobs/protip_indexer_worker_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ProtipIndexerWorker do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ProtipIndexerWorker.get_sidekiq_options["queue"]).to eql :index + end + end + +end diff --git a/spec/jobs/protips_recalculate_scores_job_spec.rb b/spec/jobs/protips_recalculate_scores_job_spec.rb new file mode 100644 index 00000000..dfea1aea --- /dev/null +++ b/spec/jobs/protips_recalculate_scores_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe ProtipsRecalculateScoresJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ProtipsRecalculateScoresJob.get_sidekiq_options["queue"]). + to eql :protip + end + end + +end diff --git a/spec/jobs/refresh_timeline_job_spec.rb b/spec/jobs/refresh_timeline_job_spec.rb new file mode 100644 index 00000000..eb374278 --- /dev/null +++ b/spec/jobs/refresh_timeline_job_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe RefreshTimelineJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(RefreshTimelineJob.get_sidekiq_options["queue"]). + to eql :timeline + end + end + +end diff --git a/spec/jobs/refresh_user_job_spec.rb b/spec/jobs/refresh_user_job_spec.rb new file mode 100644 index 00000000..aff9872f --- /dev/null +++ b/spec/jobs/refresh_user_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe RefreshUserJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(RefreshUserJob.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/jobs/resize_tilt_shift_banner_job_spec.rb b/spec/jobs/resize_tilt_shift_banner_job_spec.rb new file mode 100644 index 00000000..95abe07f --- /dev/null +++ b/spec/jobs/resize_tilt_shift_banner_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ResizeTiltShiftBannerJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ResizeTiltShiftBannerJob.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/jobs/reverse_geolocate_user_job_spec.rb b/spec/jobs/reverse_geolocate_user_job_spec.rb new file mode 100644 index 00000000..9543028b --- /dev/null +++ b/spec/jobs/reverse_geolocate_user_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe ReverseGeolocateUserJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ReverseGeolocateUserJob.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/jobs/search_sync_job_spec.rb b/spec/jobs/search_sync_job_spec.rb new file mode 100644 index 00000000..0511fdaa --- /dev/null +++ b/spec/jobs/search_sync_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe SearchSyncJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(SearchSyncJob.get_sidekiq_options["queue"]).to eql :search_sync + end + end + +end diff --git a/spec/jobs/seed_github_protips_job_spec.rb b/spec/jobs/seed_github_protips_job_spec.rb new file mode 100644 index 00000000..fbd06886 --- /dev/null +++ b/spec/jobs/seed_github_protips_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe SeedGithubProtipsJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(SeedGithubProtipsJob.get_sidekiq_options["queue"]).to eql :github + end + end + +end diff --git a/spec/jobs/teams_refresh_job_spec.rb b/spec/jobs/teams_refresh_job_spec.rb new file mode 100644 index 00000000..3af38a56 --- /dev/null +++ b/spec/jobs/teams_refresh_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe TeamsRefreshJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(TeamsRefreshJob.get_sidekiq_options["queue"]).to eql :team + end + end + +end diff --git a/spec/jobs/track_event_job_spec.rb b/spec/jobs/track_event_job_spec.rb new file mode 100644 index 00000000..1020816c --- /dev/null +++ b/spec/jobs/track_event_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe TrackEventJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(TrackEventJob.get_sidekiq_options["queue"]).to eql :event_tracker + end + end + +end diff --git a/spec/jobs/update_network_job_spec.rb b/spec/jobs/update_network_job_spec.rb new file mode 100644 index 00000000..dc301494 --- /dev/null +++ b/spec/jobs/update_network_job_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe UpdateNetworkJob do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(UpdateNetworkJob.get_sidekiq_options["queue"]).to eql :network + end + end + +end diff --git a/spec/workers/activate_pending_users_worker_spec.rb b/spec/workers/activate_pending_users_worker_spec.rb index c009fd5f..2bcb6618 100644 --- a/spec/workers/activate_pending_users_worker_spec.rb +++ b/spec/workers/activate_pending_users_worker_spec.rb @@ -1,5 +1,8 @@ -require 'sidekiq/testing' -Sidekiq::Testing.inline! - RSpec.describe ActivatePendingUsersWorker do + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ActivatePendingUsersWorker.get_sidekiq_options["queue"]). + to eql :user + end + end end diff --git a/spec/workers/protip_mailer_popular_protips_send_worker_spec.rb b/spec/workers/protip_mailer_popular_protips_send_worker_spec.rb new file mode 100644 index 00000000..435aa847 --- /dev/null +++ b/spec/workers/protip_mailer_popular_protips_send_worker_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe ProtipMailerPopularProtipsSendWorker do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ProtipMailerPopularProtipsSendWorker.get_sidekiq_options["queue"]). + to eql :mailer + end + end + +end diff --git a/spec/workers/protip_mailer_popular_protips_worker_spec.rb b/spec/workers/protip_mailer_popular_protips_worker_spec.rb new file mode 100644 index 00000000..e2da2ccb --- /dev/null +++ b/spec/workers/protip_mailer_popular_protips_worker_spec.rb @@ -0,0 +1,10 @@ +RSpec.describe ProtipMailerPopularProtipsWorker do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(ProtipMailerPopularProtipsWorker.get_sidekiq_options["queue"]). + to eql :mailer + end + end + +end diff --git a/spec/workers/refresh_stale_users_worker_spec.rb b/spec/workers/refresh_stale_users_worker_spec.rb new file mode 100644 index 00000000..fa97a377 --- /dev/null +++ b/spec/workers/refresh_stale_users_worker_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe RefreshStaleUsersWorker do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(RefreshStaleUsersWorker.get_sidekiq_options["queue"]).to eql :user + end + end + +end diff --git a/spec/workers/sitemap_refresh_worker_spec.rb b/spec/workers/sitemap_refresh_worker_spec.rb new file mode 100644 index 00000000..3ec54f72 --- /dev/null +++ b/spec/workers/sitemap_refresh_worker_spec.rb @@ -0,0 +1,9 @@ +RSpec.describe SitemapRefreshWorker do + + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(SitemapRefreshWorker.get_sidekiq_options["queue"]).to eql :index + end + end + +end diff --git a/spec/workers/user_activate_worker_spec.rb b/spec/workers/user_activate_worker_spec.rb index 554ba49a..0a2dba15 100644 --- a/spec/workers/user_activate_worker_spec.rb +++ b/spec/workers/user_activate_worker_spec.rb @@ -5,6 +5,12 @@ RSpec.describe UserActivateWorker do let(:worker) { UserActivateWorker.new } + describe 'queueing' do + it 'pushes jobs to the correct queue' do + expect(UserActivateWorker.get_sidekiq_options["queue"]).to eql :user + end + end + describe('#perform') do context 'when invalid user' do let(:user_id) { 1 }