diff --git a/.gitignore b/.gitignore index ab34ae5..a2a597b 100644 --- a/.gitignore +++ b/.gitignore @@ -74,12 +74,4 @@ yarn-debug.log* /artifacts/ # Ignore solr files -/solr/geodata-test/data/index/* -/solr/geodata-test/data/tlog/* -/solr/geodata/data/index/* -/solr/geodata/data/tlog/* - -!/solr/geodata-test/data/index/.keep -!/solr/geodata-test/data/tlog/.keep -!/solr/geodata/data/index/.keep -!/solr/geodata/data/tlog/.keep +solr/*/data/* diff --git a/Gemfile b/Gemfile index 1a1b1d3..54d5fc0 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'jbuilder' gem 'jquery-rails' gem 'omniauth-cas' gem 'pg', '~> 1.4.6' -gem 'puma', '~> 5.0' +gem 'puma', '~> 6.4.1' gem 'rack-timeout', '~> 0.6.3' gem 'rails', '~> 7.0.8' gem 'rsolr', '>= 1.0', '< 3' diff --git a/Gemfile.lock b/Gemfile.lock index 1d6a993..c7126b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) amazing_print (1.6.0) ast (2.4.2) @@ -92,19 +92,20 @@ GEM ostruct (>= 0.3.2) rails (>= 5.1, < 7.1) view_component (~> 2.66) - bootsnap (1.17.0) + bootsnap (1.18.3) msgpack (~> 1.2) bootstrap (4.6.2) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.16.1, < 2) sassc-rails (>= 2.0.0) - brakeman (6.0.1) + brakeman (6.1.2) + racc builder (3.2.4) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -112,15 +113,14 @@ GEM coderay (1.1.3) colorize (0.8.1) concurrent-ruby (1.2.3) - config (5.0.0) + config (5.4.0) deep_merge (~> 1.2, >= 1.2.1) - dry-validation (~> 1.0, >= 1.0.0) connection_pool (2.4.1) crass (1.0.6) date (3.3.4) - debug (1.8.0) - irb (>= 1.5.0) - reline (>= 0.3.1) + debug (1.9.1) + irb (~> 1.10) + reline (>= 0.3.8) deep_merge (1.2.2) deprecation (1.1.0) activesupport @@ -130,60 +130,30 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-guests (0.8.1) + devise-guests (0.8.2) devise - diff-lcs (1.5.0) + diff-lcs (1.5.1) docile (1.4.0) - domain_name (0.6.20231109) - dry-configurable (1.1.0) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-core (1.0.1) - concurrent-ruby (~> 1.0) - zeitwerk (~> 2.6) - dry-inflector (1.0.0) - dry-initializer (3.1.1) - dry-logic (1.5.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-schema (1.13.3) - concurrent-ruby (~> 1.0) - dry-configurable (~> 1.0, >= 1.0.1) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-logic (>= 1.4, < 2) - dry-types (>= 1.7, < 2) - zeitwerk (~> 2.6) - dry-types (1.7.1) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0) - dry-inflector (~> 1.0) - dry-logic (~> 1.4) - zeitwerk (~> 2.6) - dry-validation (1.10.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-schema (>= 1.12, < 2) - zeitwerk (~> 2.6) + domain_name (0.6.20240107) erubi (1.12.0) execjs (2.9.1) - faraday (2.7.12) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http faraday-net_http_persistent (2.1.0) faraday (~> 2.5) net-http-persistent (~> 4.0) + faraday-retry (2.2.0) + faraday (~> 2.0) ffi (1.16.3) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) rake - geo_combine (0.8.0) + geo_combine (0.9.0) activesupport faraday-net_http_persistent (~> 2.0) + faraday-retry (~> 2.2) git json-schema nokogiri @@ -201,7 +171,7 @@ GEM mime-types rails (>= 6.1, < 7.1) rgeo-geojson - git (1.18.0) + git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) globalid (1.2.1) @@ -210,26 +180,27 @@ GEM execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (1.0.1) + hashdiff (1.1.0) hashie (5.0.0) - http (5.1.1) + http (5.2.0) addressable (~> 2.8) + base64 (~> 0.1) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) + llhttp-ffi (~> 0.5.0) http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) i18n (1.14.4) concurrent-ruby (~> 1.0) - importmap-rails (1.2.3) + importmap-rails (2.0.1) actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) - io-console (0.6.0) - irb (1.10.0) + io-console (0.7.2) + irb (1.12.0) rdoc - reline (>= 0.3.8) + reline (>= 0.4.2) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -237,8 +208,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.7.0) - json-schema (4.1.1) + json (2.7.1) + json-schema (4.2.0) addressable (>= 2.8) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -253,7 +224,7 @@ GEM kaminari-core (= 1.2.2) kaminari-core (1.2.2) language_server-protocol (3.17.0.3) - llhttp-ffi (0.4.0) + llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) lograge (0.14.0) @@ -272,13 +243,15 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.0.0) - mime-types (3.5.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) + mime-types-data (3.2024.0305) mini_mime (1.1.5) minitar (0.9) - minitest (5.22.2) + minitest (5.22.3) msgpack (1.7.2) + net-http (0.4.1) + uri net-http-persistent (4.0.2) connection_pool (~> 2.2) net-imap (0.4.10) @@ -291,38 +264,42 @@ GEM net-smtp (0.4.0.1) net-protocol nio4r (2.7.0) - nokogiri (1.16.2-aarch64-linux) + nokogiri (1.16.3-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) oj (3.16.3) bigdecimal (>= 3.0) - omniauth (1.9.2) + omniauth (2.1.2) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) - omniauth-cas (2.0.0) - addressable (~> 2.3) - nokogiri (~> 1.5) - omniauth (~> 1.2) + rack (>= 2.2.3) + rack-protection + omniauth-cas (3.0.0) + addressable (~> 2.8) + nokogiri (~> 1.12) + omniauth (~> 2.1) orm_adapter (0.5.0) ostruct (0.6.0) ougai (1.9.1) oj (~> 3.10) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.24.0) + parser (3.3.0.5) ast (~> 2.4.1) racc pg (1.4.6) popper_js (1.16.1) - psych (5.1.1.1) + psych (5.1.2) stringio public_suffix (5.0.4) - puma (5.6.7) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) rack (2.2.8.1) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) @@ -357,10 +334,10 @@ GEM rainbow (3.1.1) rake (13.1.0) rchardet (1.8.0) - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.8.3) - reline (0.4.1) + regexp_parser (2.9.0) + reline (0.4.3) io-console (~> 0.5) request_store (1.6.0) rack (>= 1.4) @@ -375,15 +352,15 @@ GEM rsolr (2.5.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.1.0) + rspec-support (~> 3.13.0) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -391,37 +368,36 @@ GEM rspec-expectations (~> 3.12) rspec-mocks (~> 3.12) rspec-support (~> 3.12) - rspec-support (3.12.1) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.58.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-capybara (2.20.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.25.1) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) - rubocop-rails (2.22.2) + rubocop-rails (2.24.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rspec (2.25.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) rubyzip (2.3.2) sanitize (6.1.0) crass (~> 1.0.2) @@ -443,7 +419,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov-rcov (0.3.3) + simplecov-rcov (0.3.7) simplecov (>= 0.4.1) simplecov_json_formatter (0.1.4) solr_wrapper (4.0.2) @@ -458,13 +434,13 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - stimulus-rails (1.3.0) + stimulus-rails (1.3.3) railties (>= 6.0.0) stringio (3.1.0) thor (1.3.1) tilt (2.3.0) timeout (0.4.1) - turbo-rails (1.5.0) + turbo-rails (2.0.5) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) @@ -475,6 +451,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) + uri (0.13.0) view_component (2.83.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) @@ -520,7 +497,7 @@ DEPENDENCIES jquery-rails omniauth-cas pg (~> 1.4.6) - puma (~> 5.0) + puma (~> 6.4.1) rack-timeout (~> 0.6.3) rails (~> 7.0.8) rsolr (>= 1.0, < 3) diff --git a/config/puma.rb b/config/puma.rb index a10957b..6640599 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -4,8 +4,9 @@ # the maximum value specified for Puma. Default is set to 5 threads for minimum # and maximum; this matches the default thread size of Active Record. # -threads_count = ENV.fetch('PUMA_THREADS', 5).to_i -threads threads_count, threads_count +min_threads = ENV.fetch('MIN_THREADS', 1).to_i +max_threads = ENV.fetch('RAILS_MAX_THREADS', 5).to_i +threads min_threads, max_threads # Specifies the `worker_timeout` threshold that Puma will use to wait before # terminating a worker in development environments. diff --git a/solr/geodata-test/data/index/.keep b/solr/geodata-test/data/index/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/solr/geodata-test/data/tlog/.keep b/solr/geodata-test/data/tlog/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/solr/geodata/data/index/.keep b/solr/geodata/data/index/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/solr/geodata/data/tlog/.keep b/solr/geodata/data/tlog/.keep deleted file mode 100644 index e69de29..0000000