Revert "Switch to Solid Queue + Mission Control" (#588)

Gemfile

@@ -27,8 +27,8 @@ gem "image_processing", ">= 1.2"
 gem "active_storage_validations"
 
 # Background jobs
-gem "solid_queue"
-gem "mission_control-jobs"
+gem "sidekiq"
+gem "sidekiq-cron"
 
 # API
 gem "jbuilder" # JSON templating

Gemfile.lock

@@ -298,16 +298,6 @@ GEM
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     minitest (5.25.2)
-    mission_control-jobs (0.6.0)
-      actioncable (>= 7.1)
-      actionpack (>= 7.1)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      importmap-rails (>= 1.2.1)
-      irb (~> 1.13)
-      railties (>= 7.1)
-      stimulus-rails
-      turbo-rails
     msgpack (1.7.2)
     net-http (0.6.0)
       uri
@@ -414,16 +404,19 @@ GEM
     sass-embedded (1.81.0-x86_64-linux-gnu)
       google-protobuf (~> 4.28)
     securerandom (0.4.0)
+    sidekiq (7.3.2)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
+    sidekiq-cron (1.12.0)
+      fugit (~> 1.8)
+      globalid (>= 1.0.1)
+      sidekiq (>= 6)
     simple_form (5.3.1)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    solid_queue (1.0.2)
-      activejob (>= 7.1)
-      activerecord (>= 7.1)
-      concurrent-ruby (>= 1.3.1)
-      fugit (~> 1.11.0)
-      railties (>= 7.1)
-      thor (~> 1.3.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -521,16 +514,16 @@ DEPENDENCIES
   letter_opener_web
   local_time
   lograge
-  mission_control-jobs
   pagy
   premailer-rails
   puma
   rack-cors
   rack-mini-profiler
   rails!
   redis
+  sidekiq
+  sidekiq-cron
   simple_form
-  solid_queue
   sprockets-rails
   sqlite3
   standard

README.md

@@ -19,8 +19,8 @@ _The thing that powers [hackathons.hackclub.com](https://hackathons.hackclub.com
 
 ## Contributing
 
-This app is built with 🛤️ [Ruby on Rails](https://rubyonrails.org) (running [on the edge](https://shopify.engineering/living-on-the-edge-of-rails))
-and uses 🥋 [Solid Queue](https://github.com/rails/solid_queue) for running background jobs.
+This app is built with 🛤️ [Ruby on Rails](https://rubyonrails.org/) (running [on the edge](https://shopify.engineering/living-on-the-edge-of-rails))
+and uses 🥋 [Sidekiq](https://sidekiq.org/)/[Redis](https://redis.io/) for running background jobs.
 
 ### Getting Started
 
@@ -65,7 +65,7 @@ brew install vips
 - Heroku
   - Redis (Heroku Data for Redis `premium0`)
 - Hetzner
-  - Runs the Rails app and Solid Queue (3 vCPU, 4 GB)
+  - Runs the Rails app and Sidekiq (3 vCPU, 4 GB)
   - Deployed via [Kamal](https://kamal-deploy.org)
 
 ### Kamal
@@ -92,12 +92,12 @@ Then, run the following locally on your computer:
 bin/console prod
 ```
 
-### Solid Queue
+### Sidekiq
 
-Solid Queue is used to process background jobs in production. In development, we use
+Sidekiq is used to process background jobs in production. In development, we use
 the good old default Active Job Async queue adapter.
 
-To check up on jobs, visit `/admin/jobs` on the production site. You must
+To check up on Sidekiq, visit `/admin/sidekiq` on the production site. You must
 be logged in as an admin to access this page.
 
 ---

app/jobs/hackathons/digests_delivery_job.rb

@@ -1,4 +1,6 @@
 class Hackathons::DigestsDeliveryJob < ApplicationJob
+  sidekiq_options retry: 20 # up to 6.5 days
+
   def perform
     sent_digest_ids = []
     current_subscribers.find_each do |subscriber|

config/deploy.yml

@@ -16,7 +16,7 @@ servers:
   jobs:
     hosts:
       - app-1.hackathons.hackclub.com
-    cmd: bundle exec rails solid_queue:start
+    cmd: bundle exec sidekiq
     options:
       memory: 1G
       cpus: 1

config/environments/production.rb

@@ -70,7 +70,7 @@
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  config.active_job.queue_adapter = :solid_queue
+  config.active_job.queue_adapter = :sidekiq
 
   # Send emails via SMTP using Amazon SES
   config.action_mailer.delivery_method = :smtp

config/initializers/sidekiq.rb

@@ -0,0 +1,18 @@
+redis = {
+  url: ENV["REDIS_URL"], timeout: 10.seconds,
+  ssl_params: {verify_mode: OpenSSL::SSL::VERIFY_NONE}
+}
+
+Sidekiq.configure_server do |config|
+  config.redis = redis
+
+  config.capsule("AWS SES") do |capsule| # avoid rate limits
+    Rails.configuration.action_mailer.deliver_later_queue_name = "SES"
+    capsule.queues = ["SES"]
+    capsule.concurrency = 1
+  end
+end
+
+Sidekiq.configure_client do |config|
+  config.redis = redis
+end

config/routes.rb

@@ -1,3 +1,6 @@
+require "sidekiq/web"
+require "sidekiq/cron/web"
+
 Rails.application.routes.draw do
   root "hackathons#index"
 
@@ -25,10 +28,10 @@
   resources :database_dumps, except: [:new, :show]
 
   constraints Constraints::Admin do
-    namespace :admin do
-      mount MissionControl::Jobs::Engine => "jobs" if Rails.env.production?
-      mount Audits1984::Engine => "audits"
+    mount Sidekiq::Web => "/admin/sidekiq" if Rails.env.production?
+    mount Audits1984::Engine => "/admin/audits"
 
+    namespace :admin do
       resources :hackathons, except: [:new, :create] do
         scope module: :hackathons do
           resource :hold, only: :create

config/sidekiq.yml

@@ -0,0 +1,8 @@
+:verbose: false
+:timeout: 25
+
+:queues:
+  - critical
+  - SES
+  - default
+  - low