Revert "Use sidekiq as email delivery queue"

.lando.yml

@@ -22,7 +22,7 @@ services:
     type: postgres:15
     portforward: true
   orangelight_redis:
-    type: redis:7
+    type: redis:6.0.16
     portforward: true
 proxy:
   orangelight_test_solr:

Gemfile

@@ -76,7 +76,6 @@ gem 'rsolr'
 # Should this be in the test, development group?
 gem 'rspec-rails'
 gem 'rubyzip', '>= 1.2.2'
-gem 'sidekiq'
 gem 'simple_form'
 gem 'sneakers'
 gem 'sprockets-es6'

Gemfile.lock

@@ -615,11 +615,6 @@ GEM
     serverengine (2.0.7)
       sigdump (~> 0.2.2)
     set (1.1.1)
-    sidekiq (7.3.7)
-      connection_pool (>= 2.3.0)
-      logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
     sigdump (0.2.5)
     simple_form (5.3.1)
       actionpack (>= 5.2)
@@ -831,7 +826,6 @@ DEPENDENCIES
   rubocop-rspec_rails
   rubyzip (>= 1.2.2)
   selenium-webdriver
-  sidekiq
   simple_form
   sneakers
   solargraph

README.md

@@ -56,17 +56,15 @@ bundle exec cap staging deploy # deploys main branch to staging
 ```
 
 ## Staging Mail Catcher
-  To see mail that has been sent from the staging environment you must ssh tunnel into the staging indexer servers.
+  To see mail that has been sent on the staging server you must ssh tunnel into the server
   ```
-  ssh -L 1082:localhost:1080 pulsys@catalog-indexer-staging1
-  ssh -L 1085:localhost:1080 pulsys@catalog-indexer-staging2
+  ssh -L 1082:localhost:1080 pulsys@catalog-staging1
   ```
   To see mail that has been sent on the qa server you must ssh tunnel into the server
   ```
-  ssh -L 1082:localhost:1080 pulsys@catalog-indexer-qa1
-  ssh -L 1085:localhost:1080 pulsys@catalog-indexer-qa2
+  ssh -L 1082:localhost:1080 pulsys@catalog-qa1
   ```
-  Once the tunnel is open [you can see the mail that has been sent on indexer1 here]( http://localhost:1082/) and [indexer2 here]( http://localhost:1085/)
+  Once the tunnel is open [you can see the mail that has been sent on staging here]( http://localhost:1082/)
 
 ## Testing
 
@@ -247,7 +245,6 @@ Start the Bibdata server, and then set the ```bidata_base``` value in OrangeLigh
      ```
      run every time
      ```
-     bundle exec sidekiq -q default -q mailers
      mailcatcher
      ```
 

config/application.rb

@@ -50,8 +50,6 @@ class Application < Rails::Application
     # config.time_zone = 'Central Time (US & Canada)'
     config.time_zone = 'Eastern Time (US & Canada)'
 
-    config.active_job.queue_adapter = :sidekiq
-
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de

config/deploy.rb

@@ -8,6 +8,8 @@
 
 set :branch, ENV.fetch('BRANCH', 'main')
 
+# Default branch is :master
+# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
 
 # Default deploy_to directory is /var/www/my_app
 set :deploy_to, '/opt/orangelight'
@@ -157,15 +159,5 @@
   end
 end
 
-namespace :sidekiq do
-  task :restart do
-    on roles(:indexer) do
-      execute :sudo, :service, :sidekiq, :restart
-    end
-  end
-end
-
 after 'deploy:reverted', 'sneakers:restart'
 after 'deploy:published', 'sneakers:restart'
-after 'deploy:reverted', 'sidekiq:restart'
-after 'deploy:published', 'sidekiq:restart'

config/deploy/production.rb

@@ -18,9 +18,9 @@
 server 'catalog3', user: 'deploy', roles: %i[web app db worker]
 server 'catalog4', user: 'deploy', roles: %i[web app db worker]
 server 'catalog5', user: 'deploy', roles: %i[web app db worker]
-server 'catalog-indexer1', user: 'deploy', roles: %i[cron_prod1 cron_db worker indexer]
-server 'catalog-indexer2', user: 'deploy', roles: %i[cron_prod2 worker indexer]
-server 'catalog-indexer3', user: 'deploy', roles: %i[cron_prod3 worker indexer]
+server 'catalog-indexer1', user: 'deploy', roles: %i[cron_prod1 cron_db worker]
+server 'catalog-indexer2', user: 'deploy', roles: %i[cron_prod2 worker]
+server 'catalog-indexer3', user: 'deploy', roles: %i[cron_prod3 worker]
 
 set :deploy_to, '/opt/orangelight'
 set :log_level, :info

config/deploy/qa.rb

@@ -6,8 +6,8 @@
 
 server 'catalog-qa1.princeton.edu', user: 'deploy', roles: %i[web app db worker mailcatcher]
 server 'catalog-qa2.princeton.edu', user: 'deploy', roles: %i[web app db worker mailcatcher cron_db]
-server 'catalog-indexer-qa1', user: 'deploy', roles: %i[worker indexer]
-server 'catalog-indexer-qa2', user: 'deploy', roles: %i[cron_db worker indexer]
+server 'catalog-indexer-qa1', user: 'deploy', roles: %i[worker]
+server 'catalog-indexer-qa2', user: 'deploy', roles: %i[cron_db worker]
 
 namespace :env do
   desc 'Set an Orangelight environment variable'

config/deploy/staging.rb

@@ -6,8 +6,8 @@
 
 server 'catalog-staging1', user: 'deploy', roles: %i[web app db worker mailcatcher cron_db]
 server 'catalog-staging2', user: 'deploy', roles: %i[web app worker mailcatcher]
-server 'catalog-indexer-staging1', user: 'deploy', roles: %i[cron_db worker indexer]
-server 'catalog-indexer-staging2', user: 'deploy', roles: %i[cron_db worker indexer]
+server 'catalog-indexer-staging1', user: 'deploy', roles: %i[cron_db worker]
+server 'catalog-indexer-staging2', user: 'deploy', roles: %i[cron_db worker]
 
 namespace :env do
   desc 'Set an Orangelight environment variable'

config/routes.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'sidekiq/web'
-
 Rails.application.routes.draw do
   scope module: 'orangelight' do
     get 'browse', to: 'browsables#browse'
@@ -67,10 +65,6 @@
     get "sign_out", to: "sessions#destroy"
   end
 
-  authenticate :user, ->(user) { user.admin? } do
-    mount Sidekiq::Web => '/sidekiq'
-  end
-
   get '/catalog/oclc/:id', to: 'catalog#oclc'
   get '/catalog/isbn/:id', to: 'catalog#isbn'
   get '/catalog/lccn/:id', to: 'catalog#lccn'