diff --git a/Gemfile.lock b/Gemfile.lock index aed6c10f9..84547000a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -328,7 +328,7 @@ GEM mime-types rails (>= 6.1, < 7.1) rgeo-geojson - geoblacklight_admin (0.3.0) + geoblacklight_admin (0.3.1) active_storage_validations (~> 1.0) amazing_print blacklight (~> 7.33) @@ -446,7 +446,7 @@ GEM llhttp-ffi (0.3.1) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) m (1.5.1) @@ -489,7 +489,7 @@ GEM multi_xml (0.6.0) net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-imap (0.4.0) + net-imap (0.4.1) date net-protocol net-pop (0.1.2) @@ -591,7 +591,7 @@ GEM regexp_parser (2.8.1) request_store (1.5.1) rack (>= 1.4) - responders (3.1.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) @@ -667,7 +667,7 @@ GEM redis (>= 4.5.0, < 5) sidekiq-failures (1.0.4) sidekiq (>= 4.0.0) - simple_form (5.2.0) + simple_form (5.3.0) actionpack (>= 5.2) activemodel (>= 5.2) sitemap_generator (6.0.2) @@ -689,7 +689,7 @@ GEM temple (0.10.3) tether-rails (1.4.0) rails (>= 3.1) - thor (1.2.2) + thor (1.3.0) thread_safe (0.3.6) tilt (2.3.0) timeout (0.4.0) diff --git a/Procfile b/Procfile index bb9953eee..ac275ecdd 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -sidekiq: bundle exec sidekiq -q devise,1 -q default +sidekiq: bundle exec sidekiq -q priority -q devise -q default sidekiq_web: bundle exec puma sidekiq.ru diff --git a/README.md b/README.md index 0bfdbf9c1..ae34b4818 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport #### Release Version -B1G Geoportal Version v5.0.0 / GeoBlacklight v4.1.0 / GeoBlacklight Admin v0.3.0 +B1G Geoportal Version v5.0.1 / GeoBlacklight v4.1.0 / GeoBlacklight Admin v0.3.0 diff --git a/config/environments/development.rb b/config/environments/development.rb index 71294e150..f72343189 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -71,7 +71,7 @@ # Google Analytics - Dev config.google_analytics = 'UA-82483267-2' - config.active_job.queue_adapter = :inline + config.active_job.queue_adapter = :sidekiq # Annotate rendered view with file names. # config.action_view.annotate_rendered_view_with_filenames = true diff --git a/config/routes.rb b/config/routes.rb index 0c92d6f38..eb5c99bb1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,9 +3,6 @@ get 'help', :to => redirect('https://sites.google.com/umn.edu/btaa-gdp/help') get 'robots.:format' => 'robots#robots' - # Sidekiq - Uncomment and restart app to view sidekiq dashboard - # mount Sidekiq::Web => "/sidekiq" - # Feedback mount PointlessFeedback::Engine, :at => '/feedback' @@ -99,6 +96,11 @@ end namespace :admin do + + authenticate :user, ->(user) { user.admin? } do + mount Sidekiq::Web => "/sidekiq" + end + devise_for :users, controllers: {invitations: "devise/invitations"}, skip: [:registrations] # Root root to: "documents#index" diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 5dcb81cbc..ffa0268f4 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -1,2 +1,7 @@ :concurrency: 3 :max_retries: 1 + +:queues: + - priority + - devise + - default \ No newline at end of file