Merge pull request #349 from sul-dlss/348-update-sidekiq

Update Sidekiq to version 7

Gemfile

@@ -69,14 +69,13 @@ group :deployment do
   gem 'capistrano-rails'
   gem 'capistrano-bundler'
   gem 'capistrano-passenger'
-  gem 'capistrano-sidekiq'
+  gem 'capistrano-sidekiq', '~> 2.3'
   gem 'capistrano-shared_configs'
   gem 'dlss-capistrano'
 end
 
-group :production do
-  gem 'sidekiq', '~> 5.0'
-end
+# Routes requires 'sidekiq/web'
+gem 'sidekiq', '~> 7.0'
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
@@ -89,4 +88,4 @@ gem 'honeybadger'
 gem 'http'
 gem 'kaminari'
 
-gem "cssbundling-rails", "~> 1.1"
+gem 'cssbundling-rails', '~> 1.1'

Gemfile.lock

@@ -114,9 +114,10 @@ GEM
       capistrano (~> 3.0)
       sshkit (~> 1.2)
     capistrano-shared_configs (0.2.2)
-    capistrano-sidekiq (1.0.3)
+    capistrano-sidekiq (2.3.1)
       capistrano (>= 3.9.0)
-      sidekiq (>= 3.4, < 6.0)
+      capistrano-bundler
+      sidekiq (>= 6.0)
     capybara (3.40.0)
       addressable
       matrix
@@ -288,7 +289,8 @@ GEM
       ffi (~> 1.0)
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    redis (4.5.1)
+    redis-client (0.20.0)
+      connection_pool
     regexp_parser (2.9.0)
     reline (0.5.1)
       io-console (~> 0.5)
@@ -349,11 +351,11 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sidekiq (5.2.10)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (~> 2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 4.5, < 4.6.0)
+    sidekiq (7.2.2)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.19.0)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -412,7 +414,7 @@ DEPENDENCIES
   capistrano-rails
   capistrano-rvm
   capistrano-shared_configs
-  capistrano-sidekiq
+  capistrano-sidekiq (~> 2.3)
   capybara (~> 3.0)
   chart-js-rails
   cssbundling-rails (~> 1.1)
@@ -434,7 +436,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   selenium-webdriver
-  sidekiq (~> 5.0)
+  sidekiq (~> 7.0)
   sprockets-rails
   sqlite3
   turbolinks (~> 5)

Procfile.dev

@@ -1,2 +1,3 @@
 web: unset PORT && bin/rails server
 css: yarn build:css --watch
+worker: bundle exec sidekiq

README.md

@@ -12,17 +12,20 @@ The relevancy dashboard provides a way to visualize document ranking and relevan
 
 1. Ruby 3.1
 2. [bundler](http://bundler.io/) gem
+3. [Redis](https://redis.io/)
 
 ## Installation
 
 Clone the repository
 
     $ git clone [email protected]:sul-dlss/relevancy_dashboard.git
 
-Move into the app and install dependencies
+Move into the app, install dependencies, and initialize the database
 
     $ cd relevancy_dashboard
     $ bundle install
+    $ yarn install
+    $ rails db:migrate
 
 Start the development server
 
@@ -49,6 +52,6 @@ The RuboCop style enforcement can be run without running the tests
 ## Adding endpoints and searches
 
 Endpoints can be added from the application (`/endpoints/new`). It should point at
-the query endpoint (often `/select`) for a solr core/collection.
+the query endpoint (often `/select`) for a solr core/collection. It is recommended to add at least two endpoints.
 
 Then, different search cases can be added. The query parameters are raw URL parameters (of the form `q=xyz&sort=score+asc`).

config/environments/production.rb

@@ -62,6 +62,9 @@
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "relevancy_dashboard_production"
 
+  # Use sidekiq for active jobs
+  config.active_job.queue_adapter = :sidekiq
+
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.