Browse Source

[ruby/rack-sequel] Remove passenger (#9714)

Remove passenger as it is the slowest and it doesn't differtiate that
much.
Petrik de Heus 4 months ago
parent
commit
0e74035644

+ 0 - 5
frameworks/Ruby/rack-sequel/Gemfile

@@ -13,11 +13,6 @@ group :postgresql, optional: true do
   gem 'sequel_pg', '~> 1.6', platforms: :ruby, require: false
   gem 'sequel_pg', '~> 1.6', platforms: :ruby, require: false
 end
 end
 
 
-group :passenger, optional: true do
-  gem 'base64' # required by passenger on Ruby 3.4
-  gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
-end
-
 group :puma, optional: true do
 group :puma, optional: true do
   gem 'puma', '~> 6.5', require: false
   gem 'puma', '~> 6.5', require: false
 end
 end

+ 0 - 10
frameworks/Ruby/rack-sequel/Gemfile.lock

@@ -1,24 +1,16 @@
 GEM
 GEM
   remote: https://rubygems.org/
   remote: https://rubygems.org/
   specs:
   specs:
-    base64 (0.2.0)
     bigdecimal (3.1.9)
     bigdecimal (3.1.9)
     json (2.10.1)
     json (2.10.1)
     kgio (2.11.4)
     kgio (2.11.4)
     mysql2 (0.5.6)
     mysql2 (0.5.6)
     nio4r (2.7.4)
     nio4r (2.7.4)
-    passenger (6.0.26)
-      rack (>= 1.6.13)
-      rackup (>= 2.0.0)
-      rake (>= 12.3.3)
     pg (1.5.9)
     pg (1.5.9)
     puma (6.6.0)
     puma (6.6.0)
       nio4r (~> 2.0)
       nio4r (~> 2.0)
     rack (3.1.11)
     rack (3.1.11)
-    rackup (2.2.1)
-      rack (>= 3)
     raindrops (0.20.1)
     raindrops (0.20.1)
-    rake (13.2.1)
     sequel (5.90.0)
     sequel (5.90.0)
       bigdecimal
       bigdecimal
     sequel_pg (1.17.1)
     sequel_pg (1.17.1)
@@ -34,10 +26,8 @@ PLATFORMS
   x86_64-linux
   x86_64-linux
 
 
 DEPENDENCIES
 DEPENDENCIES
-  base64
   json (~> 2.8)
   json (~> 2.8)
   mysql2 (~> 0.4)
   mysql2 (~> 0.4)
-  passenger (~> 6.0)
   pg (~> 1.5)
   pg (~> 1.5)
   puma (~> 6.5)
   puma (~> 6.5)
   rack (~> 3.0)
   rack (~> 3.0)

+ 0 - 40
frameworks/Ruby/rack-sequel/benchmark_config.json

@@ -42,46 +42,6 @@
         "versus": null,
         "versus": null,
         "notes": ""
         "notes": ""
       },
       },
-      "passenger-mri": {
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "plaintext_url": "/plaintext",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "MySQL",
-        "framework": "rack",
-        "language": "Ruby",
-        "orm": "Micro",
-        "platform": "Rack",
-        "webserver": "Passenger",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "rack-sequel-passenger-mri",
-        "versus": null,
-        "notes": ""
-      },
-      "postgres-passenger-mri": {
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "rack",
-        "language": "Ruby",
-        "orm": "Micro",
-        "platform": "Rack",
-        "webserver": "Passenger",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "rack-sequel-postgres-passenger-mri",
-        "versus": null,
-        "notes": ""
-      },
       "unicorn-mri": {
       "unicorn-mri": {
         "db_url": "/db",
         "db_url": "/db",
         "query_url": "/queries?queries=",
         "query_url": "/queries?queries=",

+ 1 - 11
frameworks/Ruby/rack-sequel/hello_world.rb

@@ -15,17 +15,7 @@ class HelloWorld
   PLAINTEXT_TYPE = 'text/plain'
   PLAINTEXT_TYPE = 'text/plain'
   DATE = 'Date'
   DATE = 'Date'
   SERVER = 'Server'
   SERVER = 'Server'
-  SERVER_STRING = if defined?(PhusionPassenger)
-                    'Passenger'
-                  elsif defined?(Puma)
-                    'Puma'
-                  elsif defined?(Iodine)
-                    'Iodine'
-                  elsif defined?(Unicorn)
-                    'Unicorn'
-                  else
-                    'Ruby Rack'
-                  end
+  SERVER_STRING = "Rack"
 
 
   def bounded_queries(env)
   def bounded_queries(env)
     params = Rack::Utils.parse_query(env['QUERY_STRING'])
     params = Rack::Utils.parse_query(env['QUERY_STRING'])

+ 0 - 29
frameworks/Ruby/rack-sequel/rack-sequel-passenger-mri.dockerfile

@@ -1,29 +0,0 @@
-FROM ruby:3.4
-
-ADD ./ /rack-sequel
-
-WORKDIR /rack-sequel
-
-ENV RUBY_YJIT_ENABLE=1
-
-# Use Jemalloc
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libjemalloc2
-ENV LD_PRELOAD=libjemalloc.so.2
-
-RUN bundle config set with 'mysql passenger'
-RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
-
-# TODO: https://github.com/phusion/passenger/issues/1916
-ENV _PASSENGER_FORCE_HTTP_SESSION=true
-ENV DBTYPE=mysql
-
-RUN ruby -r /rack-sequel/config/auto_tune -e 'puts auto_tune.first' > instances
-
-EXPOSE 8080
-
-CMD bundle exec passenger start --log-level 1 \
-       --engine builtin --disable-turbocaching --disable-security-update-check \
-       --spawn-method direct --max-pool-size $(cat instances) --min-instances $(cat instances) --max-request-queue-size 1024 \
-       --address 0.0.0.0 --port 8080 --environment production
-

+ 0 - 28
frameworks/Ruby/rack-sequel/rack-sequel-postgres-passenger-mri.dockerfile

@@ -1,28 +0,0 @@
-FROM ruby:3.4
-
-ADD ./ /rack-sequel
-
-WORKDIR /rack-sequel
-
-ENV RUBY_YJIT_ENABLE=1
-
-# Use Jemalloc
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libjemalloc2
-ENV LD_PRELOAD=libjemalloc.so.2
-
-RUN bundle config set with 'postgresql passenger'
-RUN bundle install --jobs=4 --gemfile=/rack-sequel/Gemfile
-
-# TODO: https://github.com/phusion/passenger/issues/1916
-ENV _PASSENGER_FORCE_HTTP_SESSION=true
-ENV DBTYPE=postgresql
-
-RUN ruby -r /rack-sequel/config/auto_tune -e 'puts auto_tune.first' > instances
-
-EXPOSE 8080
-
-CMD bundle exec passenger start --log-level 1 \
-       --engine builtin --disable-turbocaching --disable-security-update-check \
-       --spawn-method direct --max-pool-size $(cat instances) --min-instances $(cat instances) --max-request-queue-size 1024 \
-       --address 0.0.0.0 --port 8080 --environment production