diff --git a/sample-apps/delayed_job-sample/Gemfile.lock b/sample-apps/delayed_job-sample/Gemfile.lock index 0240fb44..c79c0ad9 100644 --- a/sample-apps/delayed_job-sample/Gemfile.lock +++ b/sample-apps/delayed_job-sample/Gemfile.lock @@ -1,55 +1,55 @@ PATH remote: ../../judoscale-delayed_job specs: - judoscale-delayed_job (1.6.0) + judoscale-delayed_job (1.8.1) delayed_job_active_record (>= 4.0) - judoscale-ruby (= 1.6.0) + judoscale-ruby (= 1.8.1) PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) - activesupport (7.0.8.1) + activemodel (7.0.8.5) + activesupport (= 7.0.8.5) + activerecord (7.0.8.5) + activemodel (= 7.0.8.5) + activesupport (= 7.0.8.5) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) base64 (0.2.0) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) crass (1.0.6) - delayed_job (4.1.11) + delayed_job (4.1.12) activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.8) + delayed_job_active_record (4.1.10) activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) delayed_job_web (1.4.4) @@ -57,28 +57,28 @@ GEM delayed_job (> 2.0.3) rack-protection (>= 1.5.5) sinatra (>= 1.4.4) - erubi (1.12.0) - i18n (1.14.4) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.22.3) - mustermann (3.0.0) + minitest (5.25.1) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nio4r (2.7.1) - nokogiri (1.16.4-arm64-darwin) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - pg (1.5.6) - puma (5.6.8) + pg (1.5.8) + puma (5.6.9) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) @@ -91,9 +91,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) @@ -105,11 +105,11 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) - thor (1.3.1) - tilt (2.3.0) + thor (1.3.2) + tilt (2.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.13) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 diff --git a/sample-apps/delayed_job-sample/config/database.yml b/sample-apps/delayed_job-sample/config/database.yml index 0be6deaf..2bbbaedf 100644 --- a/sample-apps/delayed_job-sample/config/database.yml +++ b/sample-apps/delayed_job-sample/config/database.yml @@ -8,7 +8,7 @@ default: &default development: <<: *default database: judoscale_delayed_job_sample_development - username: postgres - #password: - host: localhost - #port: 5432 + # username: postgres + # password: + # host: localhost + # port: 5432 diff --git a/sample-apps/good_job-multi-db-sample/Gemfile.lock b/sample-apps/good_job-multi-db-sample/Gemfile.lock index 2d130533..41feb1ef 100644 --- a/sample-apps/good_job-multi-db-sample/Gemfile.lock +++ b/sample-apps/good_job-multi-db-sample/Gemfile.lock @@ -1,21 +1,21 @@ PATH remote: ../../judoscale-good_job specs: - judoscale-good_job (1.7.1) + judoscale-good_job (1.8.1) good_job (>= 3.0, < 5.0) - judoscale-ruby (= 1.7.1) + judoscale-ruby (= 1.8.1) PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.7.1) - judoscale-ruby (= 1.7.1) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.7.1) + judoscale-ruby (1.8.1) GEM remote: https://rubygems.org/ diff --git a/sample-apps/good_job-multi-db-sample/config/database.yml b/sample-apps/good_job-multi-db-sample/config/database.yml index 5b0cb2b1..8821176a 100644 --- a/sample-apps/good_job-multi-db-sample/config/database.yml +++ b/sample-apps/good_job-multi-db-sample/config/database.yml @@ -9,11 +9,11 @@ development: primary: <<: *default database: judoscale_good_job_sample_primary - username: postgres - host: localhost + # username: postgres + # host: localhost good_job_db: <<: *default database: judoscale_good_job_sample_good_job_db - username: postgres - host: localhost + # username: postgres + # host: localhost migrations_paths: db/good_job_db_migrate diff --git a/sample-apps/good_job-multi-db-sample/db/good_job_db_schema.rb b/sample-apps/good_job-multi-db-sample/db/good_job_db_schema.rb index 33e92680..1470d299 100644 --- a/sample-apps/good_job-multi-db-sample/db/good_job_db_schema.rb +++ b/sample-apps/good_job-multi-db-sample/db/good_job_db_schema.rb @@ -13,8 +13,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_07_08_144259) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "timescaledb" - enable_extension "timescaledb_toolkit" create_table "good_job_batches", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.datetime "created_at", null: false diff --git a/sample-apps/good_job-multi-db-sample/db/schema.rb b/sample-apps/good_job-multi-db-sample/db/schema.rb index 48fff068..b783f986 100644 --- a/sample-apps/good_job-multi-db-sample/db/schema.rb +++ b/sample-apps/good_job-multi-db-sample/db/schema.rb @@ -13,7 +13,5 @@ ActiveRecord::Schema[7.0].define(version: 0) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "timescaledb" - enable_extension "timescaledb_toolkit" end diff --git a/sample-apps/good_job-sample/Gemfile.lock b/sample-apps/good_job-sample/Gemfile.lock index 39ccb707..ef19b1ef 100644 --- a/sample-apps/good_job-sample/Gemfile.lock +++ b/sample-apps/good_job-sample/Gemfile.lock @@ -1,89 +1,89 @@ PATH remote: ../../judoscale-good_job specs: - judoscale-good_job (1.7.1) + judoscale-good_job (1.8.1) good_job (>= 3.0, < 5.0) - judoscale-ruby (= 1.7.1) + judoscale-ruby (= 1.8.1) PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.7.1) - judoscale-ruby (= 1.7.1) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.7.1) + judoscale-ruby (1.8.1) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + activejob (7.0.8.5) + activesupport (= 7.0.8.5) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activesupport (7.0.8.4) + activemodel (7.0.8.5) + activesupport (= 7.0.8.5) + activerecord (7.0.8.5) + activemodel (= 7.0.8.5) + activesupport (= 7.0.8.5) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) builder (3.3.0) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) crass (1.0.6) erubi (1.13.0) et-orbi (1.2.11) tzinfo - fugit (1.11.0) + fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - good_job (4.0.1) + good_job (4.4.1) activejob (>= 6.1.0) activerecord (>= 6.1.0) concurrent-ruby (>= 1.3.1) fugit (>= 1.11.0) railties (>= 6.1.0) thor (>= 1.0.0) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.24.1) - nio4r (2.7.1) - nokogiri (1.16.6-arm64-darwin) + minitest (5.25.1) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - pg (1.5.6) - puma (5.6.8) + pg (1.5.8) + puma (5.6.9) nio4r (~> 2.0) raabro (1.4.0) - racc (1.8.0) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -93,18 +93,18 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.2.1) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.16) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 diff --git a/sample-apps/good_job-sample/config/database.yml b/sample-apps/good_job-sample/config/database.yml index 54c9ff1a..9e1f7d77 100644 --- a/sample-apps/good_job-sample/config/database.yml +++ b/sample-apps/good_job-sample/config/database.yml @@ -8,7 +8,7 @@ default: &default development: <<: *default database: judoscale_good_job_sample_development - username: postgres - #password: - host: localhost - #port: 5432 + # username: postgres + # password: + # host: localhost + # port: 5432 diff --git a/sample-apps/good_job-sample/db/schema.rb b/sample-apps/good_job-sample/db/schema.rb index ad54fdec..1aef5b2a 100644 --- a/sample-apps/good_job-sample/db/schema.rb +++ b/sample-apps/good_job-sample/db/schema.rb @@ -13,8 +13,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_07_08_143542) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "timescaledb" - enable_extension "timescaledb_toolkit" create_table "good_job_batches", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.datetime "created_at", null: false diff --git a/sample-apps/que-2-sample/Gemfile.lock b/sample-apps/que-2-sample/Gemfile.lock index 271934d8..e774efb7 100644 --- a/sample-apps/que-2-sample/Gemfile.lock +++ b/sample-apps/que-2-sample/Gemfile.lock @@ -1,72 +1,72 @@ PATH remote: ../../judoscale-que specs: - judoscale-que (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-que (1.8.1) + judoscale-ruby (= 1.8.1) que (>= 1.0) PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) - activesupport (7.0.8.1) + activemodel (7.0.8.5) + activesupport (= 7.0.8.5) + activerecord (7.0.8.5) + activemodel (= 7.0.8.5) + activesupport (= 7.0.8.5) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) crass (1.0.6) - erubi (1.12.0) - i18n (1.14.4) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.22.3) - nio4r (2.7.1) - nokogiri (1.16.4-arm64-darwin) + minitest (5.25.1) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - pg (1.5.6) - puma (5.6.8) + pg (1.5.8) + puma (5.6.9) nio4r (~> 2.0) - que (2.3.0) - racc (1.7.3) - rack (2.2.9) + que (2.4.0) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -76,18 +76,18 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.2.1) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.13) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 diff --git a/sample-apps/que-2-sample/config/database.yml b/sample-apps/que-2-sample/config/database.yml index cb23f148..76f89463 100644 --- a/sample-apps/que-2-sample/config/database.yml +++ b/sample-apps/que-2-sample/config/database.yml @@ -8,7 +8,7 @@ default: &default development: <<: *default database: judoscale_que_sample_development - username: postgres - #password: - host: localhost - #port: 5432 + # username: postgres + # password: + # host: localhost + # port: 5432 diff --git a/sample-apps/rails-sample/Gemfile.lock b/sample-apps/rails-sample/Gemfile.lock index 0316ae6c..c632b016 100644 --- a/sample-apps/rails-sample/Gemfile.lock +++ b/sample-apps/rails-sample/Gemfile.lock @@ -1,58 +1,58 @@ PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.8.1) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) crass (1.0.6) - erubi (1.12.0) - i18n (1.14.4) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.22.3) - nio4r (2.7.1) - nokogiri (1.16.4-arm64-darwin) + minitest (5.25.1) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - puma (5.6.8) + puma (5.6.9) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -62,18 +62,18 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.2.1) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.13) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 diff --git a/sample-apps/resque-sample/Gemfile.lock b/sample-apps/resque-sample/Gemfile.lock index 18b8f3e1..4e0f1223 100644 --- a/sample-apps/resque-sample/Gemfile.lock +++ b/sample-apps/resque-sample/Gemfile.lock @@ -1,71 +1,71 @@ PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-resque specs: - judoscale-resque (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-resque (1.8.1) + judoscale-ruby (= 1.8.1) resque (>= 2.0) PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.8.1) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) base64 (0.2.0) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) - erubi (1.12.0) - i18n (1.14.4) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.22.3) + minitest (5.25.1) mono_logger (1.1.2) multi_json (1.15.0) - mustermann (3.0.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nio4r (2.7.1) - nokogiri (1.16.4-arm64-darwin) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - puma (5.6.8) + puma (5.6.9) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) @@ -78,17 +78,17 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.2.1) - redis (5.2.0) + redis (5.3.0) redis-client (>= 0.22.0) - redis-client (0.22.1) + redis-client (0.22.2) connection_pool redis-namespace (1.11.0) redis (>= 4) @@ -103,11 +103,11 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) - thor (1.3.1) - tilt (2.3.0) + thor (1.3.2) + tilt (2.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.13) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 diff --git a/sample-apps/shoryuken-sample/Gemfile.lock b/sample-apps/shoryuken-sample/Gemfile.lock index 49dc5fd0..c58646b6 100644 --- a/sample-apps/shoryuken-sample/Gemfile.lock +++ b/sample-apps/shoryuken-sample/Gemfile.lock @@ -1,87 +1,87 @@ PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) PATH remote: ../../judoscale-shoryuken specs: - judoscale-shoryuken (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-shoryuken (1.8.1) + judoscale-ruby (= 1.8.1) shoryuken (>= 6.0) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.1) - activesupport (= 7.0.8.1) + activejob (7.0.8.5) + activesupport (= 7.0.8.5) globalid (>= 0.3.6) - activesupport (7.0.8.1) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) aws-eventstream (1.3.0) - aws-partitions (1.922.0) - aws-sdk-core (3.193.0) + aws-partitions (1.991.0) + aws-sdk-core (3.209.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-sqs (1.71.0) - aws-sdk-core (~> 3, >= 3.193.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.8.0) + aws-sdk-sqs (1.86.0) + aws-sdk-core (~> 3, >= 3.207.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.0) aws-eventstream (~> 1, >= 1.0.2) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) crass (1.0.6) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) - railties (>= 3.2) - erubi (1.12.0) + dotenv (3.1.4) + dotenv-rails (3.1.4) + dotenv (= 3.1.4) + railties (>= 6.1) + erubi (1.13.0) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.4) + i18n (1.14.6) concurrent-ruby (~> 1.0) jmespath (1.6.2) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.22.3) - nio4r (2.7.1) - nokogiri (1.16.4-arm64-darwin) + minitest (5.25.1) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - puma (5.6.8) + puma (5.6.9) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -91,9 +91,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) @@ -103,10 +103,10 @@ GEM aws-sdk-core (>= 2) concurrent-ruby thor - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.13) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 diff --git a/sample-apps/sidekiq-sample/Gemfile.lock b/sample-apps/sidekiq-sample/Gemfile.lock index 0b6506dc..c23d6499 100644 --- a/sample-apps/sidekiq-sample/Gemfile.lock +++ b/sample-apps/sidekiq-sample/Gemfile.lock @@ -1,66 +1,66 @@ PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) PATH remote: ../../judoscale-sidekiq specs: - judoscale-sidekiq (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-sidekiq (1.8.1) + judoscale-ruby (= 1.8.1) sidekiq (>= 5.0) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (7.0.8.1) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) - erubi (1.12.0) - i18n (1.14.4) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) method_source (1.1.0) - minitest (5.22.3) - nio4r (2.7.1) - nokogiri (1.16.4-arm64-darwin) + minitest (5.25.1) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - puma (5.6.8) + puma (5.6.9) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -70,9 +70,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) @@ -83,10 +83,10 @@ GEM connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) - thor (1.3.1) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.13) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 diff --git a/sample-apps/sinatra-sample/Gemfile b/sample-apps/sinatra-sample/Gemfile index 93fb39d6..219b6186 100644 --- a/sample-apps/sinatra-sample/Gemfile +++ b/sample-apps/sinatra-sample/Gemfile @@ -3,6 +3,7 @@ source "https://rubygems.org" gem "sinatra" +gem "rackup" gem "puma" gem "judoscale-ruby", path: "../../judoscale-ruby" gem "judoscale-rack", path: "../../judoscale-rack" diff --git a/sample-apps/sinatra-sample/Gemfile.lock b/sample-apps/sinatra-sample/Gemfile.lock index 26d89128..1ccd5e60 100644 --- a/sample-apps/sinatra-sample/Gemfile.lock +++ b/sample-apps/sinatra-sample/Gemfile.lock @@ -1,30 +1,33 @@ PATH remote: ../../judoscale-rack specs: - judoscale-rack (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rack (1.8.1) + judoscale-ruby (= 1.8.1) rack PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) GEM remote: https://rubygems.org/ specs: base64 (0.2.0) - mustermann (3.0.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nio4r (2.7.1) - puma (6.4.2) + nio4r (2.7.3) + puma (6.4.3) nio4r (~> 2.0) - rack (3.0.10) + rack (3.1.8) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) rack-session (2.0.0) rack (>= 3.0.0) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) ruby2_keywords (0.0.5) sinatra (4.0.0) mustermann (~> 3.0) @@ -32,7 +35,8 @@ GEM rack-protection (= 4.0.0) rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - tilt (2.3.0) + tilt (2.4.0) + webrick (1.8.2) PLATFORMS arm64-darwin-21 @@ -42,6 +46,7 @@ DEPENDENCIES judoscale-rack! judoscale-ruby! puma + rackup sinatra BUNDLED WITH diff --git a/sample-apps/solid_queue-sample/Gemfile b/sample-apps/solid_queue-sample/Gemfile index 4f7bb835..4f623f64 100644 --- a/sample-apps/solid_queue-sample/Gemfile +++ b/sample-apps/solid_queue-sample/Gemfile @@ -15,6 +15,6 @@ gem "judoscale-ruby", path: "../../judoscale-ruby" gem "judoscale-rails", path: "../../judoscale-rails" gem "judoscale-solid_queue", path: "../../judoscale-solid_queue" -gem "solid_queue", "~> 0.3" +gem "solid_queue", "~> 1.0" gem "mission_control-jobs" gem "sprockets-rails" diff --git a/sample-apps/solid_queue-sample/Gemfile.lock b/sample-apps/solid_queue-sample/Gemfile.lock index bb6b8a7a..84284339 100644 --- a/sample-apps/solid_queue-sample/Gemfile.lock +++ b/sample-apps/solid_queue-sample/Gemfile.lock @@ -1,54 +1,54 @@ PATH remote: ../../judoscale-rails specs: - judoscale-rails (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-rails (1.8.1) + judoscale-ruby (= 1.8.1) railties PATH remote: ../../judoscale-ruby specs: - judoscale-ruby (1.6.0) + judoscale-ruby (1.8.1) PATH remote: ../../judoscale-solid_queue specs: - judoscale-solid_queue (1.6.0) - judoscale-ruby (= 1.6.0) + judoscale-solid_queue (1.8.1) + judoscale-ruby (= 1.8.1) solid_queue (>= 0.3) GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + actioncable (7.1.4.1) + actionpack (= 7.1.4.1) + activesupport (= 7.1.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailbox (7.1.4.1) + actionpack (= 7.1.4.1) + activejob (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.2) - actionpack (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailer (7.1.4.1) + actionpack (= 7.1.4.1) + actionview (= 7.1.4.1) + activejob (= 7.1.4.1) + activesupport (= 7.1.4.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.1.4.1) + actionview (= 7.1.4.1) + activesupport (= 7.1.4.1) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -56,35 +56,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.2) - actionpack (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actiontext (7.1.4.1) + actionpack (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.1.4.1) + activesupport (= 7.1.4.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.2) - activesupport (= 7.1.3.2) + activejob (7.1.4.1) + activesupport (= 7.1.4.1) globalid (>= 0.3.6) - activemodel (7.1.3.2) - activesupport (= 7.1.3.2) - activerecord (7.1.3.2) - activemodel (= 7.1.3.2) - activesupport (= 7.1.3.2) + activemodel (7.1.4.1) + activesupport (= 7.1.4.1) + activerecord (7.1.4.1) + activemodel (= 7.1.4.1) + activesupport (= 7.1.4.1) timeout (>= 0.4.0) - activestorage (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activesupport (= 7.1.3.2) + activestorage (7.1.4.1) + actionpack (= 7.1.4.1) + activejob (= 7.1.4.1) + activerecord (= 7.1.4.1) + activesupport (= 7.1.4.1) marcel (~> 1.0) - activesupport (7.1.3.2) + activesupport (7.1.4.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -95,30 +95,30 @@ GEM mutex_m tzinfo (~> 2.0) base64 (0.2.0) - bigdecimal (3.1.7) - builder (3.2.4) - concurrent-ruby (1.2.3) + bigdecimal (3.1.8) + builder (3.3.0) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) date (3.3.4) drb (2.2.1) - erubi (1.12.0) + erubi (1.13.0) et-orbi (1.2.11) tzinfo - fugit (1.9.0) - et-orbi (~> 1, >= 1.2.7) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.4) + i18n (1.14.6) concurrent-ruby (~> 1.0) - importmap-rails (2.0.1) + importmap-rails (2.0.3) actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) io-console (0.7.2) - irb (1.12.0) - rdoc + irb (1.14.1) + rdoc (>= 4.0.0) reline (>= 0.4.2) loofah (2.22.0) crass (~> 1.0.2) @@ -130,14 +130,15 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) - minitest (5.22.3) - mission_control-jobs (0.2.1) + minitest (5.25.1) + mission_control-jobs (0.3.3) importmap-rails - rails (~> 7.1) + irb (~> 1.13) + rails (>= 7.1) stimulus-rails turbo-rails mutex_m (0.2.0) - net-imap (0.4.10) + net-imap (0.4.17) date net-protocol net-pop (0.1.2) @@ -146,21 +147,21 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.1) - nokogiri (1.16.4-arm64-darwin) + nio4r (2.7.3) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - pg (1.5.6) + pg (1.5.8) psych (5.1.2) stringio - puma (6.4.2) + puma (6.4.3) nio4r (~> 2.0) raabro (1.4.0) - racc (1.7.3) - rack (3.0.10) + racc (1.8.1) + rack (3.1.8) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -168,20 +169,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.3.2) - actioncable (= 7.1.3.2) - actionmailbox (= 7.1.3.2) - actionmailer (= 7.1.3.2) - actionpack (= 7.1.3.2) - actiontext (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activemodel (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + rails (7.1.4.1) + actioncable (= 7.1.4.1) + actionmailbox (= 7.1.4.1) + actionmailer (= 7.1.4.1) + actionpack (= 7.1.4.1) + actiontext (= 7.1.4.1) + actionview (= 7.1.4.1) + activejob (= 7.1.4.1) + activemodel (= 7.1.4.1) + activerecord (= 7.1.4.1) + activestorage (= 7.1.4.1) + activesupport (= 7.1.4.1) bundler (>= 1.15.0) - railties (= 7.1.3.2) + railties (= 7.1.4.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -189,48 +190,48 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + railties (7.1.4.1) + actionpack (= 7.1.4.1) + activesupport (= 7.1.4.1) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.2.1) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) - reline (0.5.4) + reline (0.5.10) io-console (~> 0.5) - solid_queue (0.3.0) + solid_queue (1.0.0) activejob (>= 7.1) activerecord (>= 7.1) - concurrent-ruby (~> 1.2.2) - fugit (~> 1.9.0) + 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) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - stimulus-rails (1.3.3) + stimulus-rails (1.3.4) railties (>= 6.0.0) - stringio (3.1.0) - thor (1.3.1) + stringio (3.1.1) + thor (1.3.2) timeout (0.4.1) - turbo-rails (2.0.5) + turbo-rails (2.0.11) actionpack (>= 6.0.0) - activejob (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - webrick (1.8.1) + webrick (1.8.2) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.13) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-20 @@ -252,7 +253,7 @@ DEPENDENCIES pg (~> 1.5) puma (~> 6.0) railties (~> 7.1.0) - solid_queue (~> 0.3) + solid_queue (~> 1.0) sprockets-rails BUNDLED WITH diff --git a/sample-apps/solid_queue-sample/Procfile b/sample-apps/solid_queue-sample/Procfile index b2b0c166..62cb0e68 100644 --- a/sample-apps/solid_queue-sample/Procfile +++ b/sample-apps/solid_queue-sample/Procfile @@ -5,7 +5,7 @@ proxy: npx judoscale-adapter-proxy-server # on which env you want to spoof locally. heroku_rails: DYNO=web.1 bundle exec rails server -heroku_solid_queue: DYNO=worker.1 bundle exec rake solid_queue:start +heroku_solid_queue: DYNO=worker.1 bin/jobs # render_rails: RENDER_SERVICE_ID=srv-xyz RENDER_INSTANCE_ID=srv-xyz-1234 RENDER_SERVICE_TYPE=web bundle exec rails server # render_solid_queue: RENDER_SERVICE_ID=srv-abc RENDER_INSTANCE_ID=srv-abc-1234 RENDER_SERVICE_TYPE=worker bundle exec rake solid_queue:start diff --git a/sample-apps/solid_queue-sample/bin/jobs b/sample-apps/solid_queue-sample/bin/jobs new file mode 100755 index 00000000..dcf59f30 --- /dev/null +++ b/sample-apps/solid_queue-sample/bin/jobs @@ -0,0 +1,6 @@ +#!/usr/bin/env ruby + +require_relative "../config/environment" +require "solid_queue/cli" + +SolidQueue::Cli.start(ARGV) diff --git a/sample-apps/solid_queue-sample/config/database.yml b/sample-apps/solid_queue-sample/config/database.yml index 106744b6..854274a2 100644 --- a/sample-apps/solid_queue-sample/config/database.yml +++ b/sample-apps/solid_queue-sample/config/database.yml @@ -8,7 +8,7 @@ default: &default development: <<: *default database: judoscale_solid_queue_sample_development - username: postgres - #password: - host: localhost - #port: 5432 + # username: postgres + # password: + # host: localhost + # port: 5432 diff --git a/sample-apps/solid_queue-sample/config/queue.yml b/sample-apps/solid_queue-sample/config/queue.yml new file mode 100644 index 00000000..9eace59c --- /dev/null +++ b/sample-apps/solid_queue-sample/config/queue.yml @@ -0,0 +1,18 @@ +default: &default + dispatchers: + - polling_interval: 1 + batch_size: 500 + workers: + - queues: "*" + threads: 3 + processes: <%= ENV.fetch("JOB_CONCURRENCY", 1) %> + polling_interval: 0.1 + +development: + <<: *default + +test: + <<: *default + +production: + <<: *default diff --git a/sample-apps/solid_queue-sample/config/recurring.yml b/sample-apps/solid_queue-sample/config/recurring.yml new file mode 100644 index 00000000..d045b191 --- /dev/null +++ b/sample-apps/solid_queue-sample/config/recurring.yml @@ -0,0 +1,10 @@ +# production: +# periodic_cleanup: +# class: CleanSoftDeletedRecordsJob +# queue: background +# args: [ 1000, { batch_size: 500 } ] +# schedule: every hour +# periodic_command: +# command: "SoftDeletedRecord.due.delete_all" +# priority: 2 +# schedule: at 5am every day diff --git a/sample-apps/solid_queue-sample/config/solid_queue.yml b/sample-apps/solid_queue-sample/config/solid_queue.yml deleted file mode 100644 index ed8d6ea1..00000000 --- a/sample-apps/solid_queue-sample/config/solid_queue.yml +++ /dev/null @@ -1,20 +0,0 @@ -# default: &default -# dispatchers: -# - polling_interval: 1 -# batch_size: 500 -# workers: -# - queues: "*" -# threads: 3 -# processes: 1 -# polling_interval: 0.1 -# -development: - workers: - - queues: [high, default, low] - threads: 3 -# -# test: -# <<: *default -# -# production: -# <<: *default diff --git a/sample-apps/solid_queue-sample/db/migrate/20240423195525_create_solid_queue_tables.solid_queue.rb b/sample-apps/solid_queue-sample/db/migrate/20240423195525_create_solid_queue_tables.solid_queue.rb deleted file mode 100644 index 6d8c4f61..00000000 --- a/sample-apps/solid_queue-sample/db/migrate/20240423195525_create_solid_queue_tables.solid_queue.rb +++ /dev/null @@ -1,101 +0,0 @@ -# This migration comes from solid_queue (originally 20231211200639) -class CreateSolidQueueTables < ActiveRecord::Migration[7.0] - def change - create_table :solid_queue_jobs do |t| - t.string :queue_name, null: false - t.string :class_name, null: false, index: true - t.text :arguments - t.integer :priority, default: 0, null: false - t.string :active_job_id, index: true - t.datetime :scheduled_at - t.datetime :finished_at, index: true - t.string :concurrency_key - - t.timestamps - - t.index [ :queue_name, :finished_at ], name: "index_solid_queue_jobs_for_filtering" - t.index [ :scheduled_at, :finished_at ], name: "index_solid_queue_jobs_for_alerting" - end - - create_table :solid_queue_scheduled_executions do |t| - t.references :job, index: { unique: true }, null: false - t.string :queue_name, null: false - t.integer :priority, default: 0, null: false - t.datetime :scheduled_at, null: false - - t.datetime :created_at, null: false - - t.index [ :scheduled_at, :priority, :job_id ], name: "index_solid_queue_dispatch_all" - end - - create_table :solid_queue_ready_executions do |t| - t.references :job, index: { unique: true }, null: false - t.string :queue_name, null: false - t.integer :priority, default: 0, null: false - - t.datetime :created_at, null: false - - t.index [ :priority, :job_id ], name: "index_solid_queue_poll_all" - t.index [ :queue_name, :priority, :job_id ], name: "index_solid_queue_poll_by_queue" - end - - create_table :solid_queue_claimed_executions do |t| - t.references :job, index: { unique: true }, null: false - t.bigint :process_id - t.datetime :created_at, null: false - - t.index [ :process_id, :job_id ] - end - - create_table :solid_queue_blocked_executions do |t| - t.references :job, index: { unique: true }, null: false - t.string :queue_name, null: false - t.integer :priority, default: 0, null: false - t.string :concurrency_key, null: false - t.datetime :expires_at, null: false - - t.datetime :created_at, null: false - - t.index [ :expires_at, :concurrency_key ], name: "index_solid_queue_blocked_executions_for_maintenance" - end - - create_table :solid_queue_failed_executions do |t| - t.references :job, index: { unique: true }, null: false - t.text :error - t.datetime :created_at, null: false - end - - create_table :solid_queue_pauses do |t| - t.string :queue_name, null: false, index: { unique: true } - t.datetime :created_at, null: false - end - - create_table :solid_queue_processes do |t| - t.string :kind, null: false - t.datetime :last_heartbeat_at, null: false, index: true - t.bigint :supervisor_id, index: true - - t.integer :pid, null: false - t.string :hostname - t.text :metadata - - t.datetime :created_at, null: false - end - - create_table :solid_queue_semaphores do |t| - t.string :key, null: false, index: { unique: true } - t.integer :value, default: 1, null: false - t.datetime :expires_at, null: false, index: true - - t.timestamps - - t.index [ :key, :value ], name: "index_solid_queue_semaphores_on_key_and_value" - end - - add_foreign_key :solid_queue_blocked_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade - add_foreign_key :solid_queue_claimed_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade - add_foreign_key :solid_queue_failed_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade - add_foreign_key :solid_queue_ready_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade - add_foreign_key :solid_queue_scheduled_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade - end -end diff --git a/sample-apps/solid_queue-sample/db/migrate/20240423195526_add_missing_index_to_blocked_executions.solid_queue.rb b/sample-apps/solid_queue-sample/db/migrate/20240423195526_add_missing_index_to_blocked_executions.solid_queue.rb deleted file mode 100644 index 2d96b10d..00000000 --- a/sample-apps/solid_queue-sample/db/migrate/20240423195526_add_missing_index_to_blocked_executions.solid_queue.rb +++ /dev/null @@ -1,6 +0,0 @@ -# This migration comes from solid_queue (originally 20240110143450) -class AddMissingIndexToBlockedExecutions < ActiveRecord::Migration[7.1] - def change - add_index :solid_queue_blocked_executions, [ :concurrency_key, :priority, :job_id ], name: "index_solid_queue_blocked_executions_for_release" - end -end diff --git a/sample-apps/solid_queue-sample/db/migrate/20240423195527_create_recurring_executions.solid_queue.rb b/sample-apps/solid_queue-sample/db/migrate/20240423195527_create_recurring_executions.solid_queue.rb deleted file mode 100644 index 4c49821b..00000000 --- a/sample-apps/solid_queue-sample/db/migrate/20240423195527_create_recurring_executions.solid_queue.rb +++ /dev/null @@ -1,15 +0,0 @@ -# This migration comes from solid_queue (originally 20240218110712) -class CreateRecurringExecutions < ActiveRecord::Migration[7.1] - def change - create_table :solid_queue_recurring_executions do |t| - t.references :job, index: { unique: true }, null: false - t.string :task_key, null: false - t.datetime :run_at, null: false - t.datetime :created_at, null: false - - t.index [ :task_key, :run_at ], unique: true - end - - add_foreign_key :solid_queue_recurring_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade - end -end diff --git a/sample-apps/solid_queue-sample/db/migrate/20241016134500_create_solid_queue_tables.rb b/sample-apps/solid_queue-sample/db/migrate/20241016134500_create_solid_queue_tables.rb new file mode 100644 index 00000000..60c8b80b --- /dev/null +++ b/sample-apps/solid_queue-sample/db/migrate/20241016134500_create_solid_queue_tables.rb @@ -0,0 +1,131 @@ +class CreateSolidQueueTables < ActiveRecord::Migration[7.1] + def change + create_table "solid_queue_blocked_executions", force: :cascade do |t| + t.bigint "job_id", null: false + t.string "queue_name", null: false + t.integer "priority", default: 0, null: false + t.string "concurrency_key", null: false + t.datetime "expires_at", null: false + t.datetime "created_at", null: false + t.index [ "concurrency_key", "priority", "job_id" ], name: "index_solid_queue_blocked_executions_for_release" + t.index [ "expires_at", "concurrency_key" ], name: "index_solid_queue_blocked_executions_for_maintenance" + t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true + end + + create_table "solid_queue_claimed_executions", force: :cascade do |t| + t.bigint "job_id", null: false + t.bigint "process_id" + t.datetime "created_at", null: false + t.index [ "job_id" ], name: "index_solid_queue_claimed_executions_on_job_id", unique: true + t.index [ "process_id", "job_id" ], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id" + end + + create_table "solid_queue_failed_executions", force: :cascade do |t| + t.bigint "job_id", null: false + t.text "error" + t.datetime "created_at", null: false + t.index [ "job_id" ], name: "index_solid_queue_failed_executions_on_job_id", unique: true + end + + create_table "solid_queue_jobs", force: :cascade do |t| + t.string "queue_name", null: false + t.string "class_name", null: false + t.text "arguments" + t.integer "priority", default: 0, null: false + t.string "active_job_id" + t.datetime "scheduled_at" + t.datetime "finished_at" + t.string "concurrency_key" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index [ "active_job_id" ], name: "index_solid_queue_jobs_on_active_job_id" + t.index [ "class_name" ], name: "index_solid_queue_jobs_on_class_name" + t.index [ "finished_at" ], name: "index_solid_queue_jobs_on_finished_at" + t.index [ "queue_name", "finished_at" ], name: "index_solid_queue_jobs_for_filtering" + t.index [ "scheduled_at", "finished_at" ], name: "index_solid_queue_jobs_for_alerting" + end + + create_table "solid_queue_pauses", force: :cascade do |t| + t.string "queue_name", null: false + t.datetime "created_at", null: false + t.index [ "queue_name" ], name: "index_solid_queue_pauses_on_queue_name", unique: true + end + + create_table "solid_queue_processes", force: :cascade do |t| + t.string "kind", null: false + t.datetime "last_heartbeat_at", null: false + t.bigint "supervisor_id" + t.integer "pid", null: false + t.string "hostname" + t.text "metadata" + t.datetime "created_at", null: false + t.string "name", null: false + t.index [ "last_heartbeat_at" ], name: "index_solid_queue_processes_on_last_heartbeat_at" + t.index [ "name", "supervisor_id" ], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true + t.index [ "supervisor_id" ], name: "index_solid_queue_processes_on_supervisor_id" + end + + create_table "solid_queue_ready_executions", force: :cascade do |t| + t.bigint "job_id", null: false + t.string "queue_name", null: false + t.integer "priority", default: 0, null: false + t.datetime "created_at", null: false + t.index [ "job_id" ], name: "index_solid_queue_ready_executions_on_job_id", unique: true + t.index [ "priority", "job_id" ], name: "index_solid_queue_poll_all" + t.index [ "queue_name", "priority", "job_id" ], name: "index_solid_queue_poll_by_queue" + end + + create_table "solid_queue_recurring_executions", force: :cascade do |t| + t.bigint "job_id", null: false + t.string "task_key", null: false + t.datetime "run_at", null: false + t.datetime "created_at", null: false + t.index [ "job_id" ], name: "index_solid_queue_recurring_executions_on_job_id", unique: true + t.index [ "task_key", "run_at" ], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true + end + + create_table "solid_queue_recurring_tasks", force: :cascade do |t| + t.string "key", null: false + t.string "schedule", null: false + t.string "command", limit: 2048 + t.string "class_name" + t.text "arguments" + t.string "queue_name" + t.integer "priority", default: 0 + t.boolean "static", default: true, null: false + t.text "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index [ "key" ], name: "index_solid_queue_recurring_tasks_on_key", unique: true + t.index [ "static" ], name: "index_solid_queue_recurring_tasks_on_static" + end + + create_table "solid_queue_scheduled_executions", force: :cascade do |t| + t.bigint "job_id", null: false + t.string "queue_name", null: false + t.integer "priority", default: 0, null: false + t.datetime "scheduled_at", null: false + t.datetime "created_at", null: false + t.index [ "job_id" ], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true + t.index [ "scheduled_at", "priority", "job_id" ], name: "index_solid_queue_dispatch_all" + end + + create_table "solid_queue_semaphores", force: :cascade do |t| + t.string "key", null: false + t.integer "value", default: 1, null: false + t.datetime "expires_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index [ "expires_at" ], name: "index_solid_queue_semaphores_on_expires_at" + t.index [ "key", "value" ], name: "index_solid_queue_semaphores_on_key_and_value" + t.index [ "key" ], name: "index_solid_queue_semaphores_on_key", unique: true + end + + add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade + add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade + add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade + add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade + add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade + add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade + end +end diff --git a/sample-apps/solid_queue-sample/db/schema.rb b/sample-apps/solid_queue-sample/db/schema.rb index d3f2c104..f099c150 100644 --- a/sample-apps/solid_queue-sample/db/schema.rb +++ b/sample-apps/solid_queue-sample/db/schema.rb @@ -10,19 +10,9 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_04_23_195527) do - create_schema "_timescaledb_cache" - create_schema "_timescaledb_catalog" - create_schema "_timescaledb_config" - create_schema "_timescaledb_internal" - create_schema "timescaledb_experimental" - create_schema "timescaledb_information" - create_schema "toolkit_experimental" - +ActiveRecord::Schema[7.1].define(version: 2024_10_16_134500) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" - enable_extension "timescaledb" - enable_extension "timescaledb_toolkit" create_table "solid_queue_blocked_executions", force: :cascade do |t| t.bigint "job_id", null: false @@ -83,7 +73,9 @@ t.string "hostname" t.text "metadata" t.datetime "created_at", null: false + t.string "name", null: false t.index ["last_heartbeat_at"], name: "index_solid_queue_processes_on_last_heartbeat_at" + t.index ["name", "supervisor_id"], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true t.index ["supervisor_id"], name: "index_solid_queue_processes_on_supervisor_id" end @@ -106,6 +98,22 @@ t.index ["task_key", "run_at"], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true end + create_table "solid_queue_recurring_tasks", force: :cascade do |t| + t.string "key", null: false + t.string "schedule", null: false + t.string "command", limit: 2048 + t.string "class_name" + t.text "arguments" + t.string "queue_name" + t.integer "priority", default: 0 + t.boolean "static", default: true, null: false + t.text "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["key"], name: "index_solid_queue_recurring_tasks_on_key", unique: true + t.index ["static"], name: "index_solid_queue_recurring_tasks_on_static" + end + create_table "solid_queue_scheduled_executions", force: :cascade do |t| t.bigint "job_id", null: false t.string "queue_name", null: false