Skip to content

[ruby/sinatra] Remove passenger #9713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2025
Merged

[ruby/sinatra] Remove passenger #9713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions frameworks/Ruby/sinatra-sequel/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ group :iodine, optional: true do
gem 'iodine', '~> 0.7', platforms: [:ruby, :mswin], require: false
end

group :passenger, optional: true do
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
end

group :puma, optional: true do
gem 'puma', '~> 6.4', require: false
end
Expand Down
8 changes: 0 additions & 8 deletions frameworks/Ruby/sinatra-sequel/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ GEM
ruby2_keywords (~> 0.0.1)
mysql2 (0.5.6)
nio4r (2.7.4)
passenger (6.0.26)
rack (>= 1.6.13)
rackup (>= 2.0.0)
rake (>= 12.3.3)
pg (1.5.9)
puma (6.6.0)
nio4r (~> 2.0)
Expand All @@ -26,10 +22,7 @@ GEM
rack-session (2.1.0)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rackup (2.2.1)
rack (>= 3)
raindrops (0.20.1)
rake (13.2.1)
ruby2_keywords (0.0.5)
sequel (5.90.0)
bigdecimal
Expand All @@ -56,7 +49,6 @@ DEPENDENCIES
iodine (~> 0.7)
json (~> 2.8)
mysql2 (~> 0.5)
passenger (~> 6.0)
pg (~> 1.5)
puma (~> 6.4)
sequel (~> 5.0)
Expand Down
20 changes: 0 additions & 20 deletions frameworks/Ruby/sinatra-sequel/benchmark_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,26 +62,6 @@
"versus": "rack-sequel-postgres-iodine-mri",
"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": "sinatra",
"language": "Ruby",
"orm": "Full",
"platform": "Rack",
"webserver": "Passenger",
"os": "Linux",
"database_os": "Linux",
"display_name": "sinatra-sequel-postgres-passenger-mri",
"versus": "rack-sequel-postgres-passenger-mri",
"notes": ""
},
"postgres-unicorn-mri": {
"db_url": "/db",
"query_url": "/queries?queries=",
Expand Down
19 changes: 3 additions & 16 deletions frameworks/Ruby/sinatra-sequel/boot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,7 @@
QUERIES_MIN = 1
QUERIES_MAX = 500
SEQUEL_NO_ASSOCIATIONS = true

SERVER_STRING =
if defined?(PhusionPassenger)
'passenger'
elsif defined?(Puma)
'puma'
elsif defined?(Unicorn)
'unicorn'
elsif defined?(Iodine)
'iodine'
end
SERVER_STRING = "Sinatra"

Bundler.require(:default) # Load core modules

Expand All @@ -33,13 +23,10 @@ def connect(dbtype)
opts = {}

# Determine threading/thread pool size and timeout
if defined?(JRUBY_VERSION)
opts[:max_connections] = (2 * Math.log(Integer(ENV.fetch('MAX_CONCURRENCY')))).floor
opts[:pool_timeout] = 10
elsif defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
if defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
opts[:max_connections] = (2 * Math.log(threads)).floor
opts[:pool_timeout] = 10
elsif defined?(Unicorn) || defined?(Passenger)
elsif defined?(Unicorn)
Sequel.single_threaded = true
end

Expand Down
28 changes: 0 additions & 28 deletions frameworks/Ruby/sinatra-sequel/sinatra-sequel-postgres-passenger-mri.dockerfile
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions frameworks/Ruby/sinatra/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ group :iodine, optional: true do
gem 'iodine', '~> 0.7', platforms: [:ruby, :mswin], require: false
end

group :passenger, optional: true do
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
end

group :puma, optional: true do
gem 'puma', '~> 6.4', require: false
end
Expand Down
6 changes: 0 additions & 6 deletions frameworks/Ruby/sinatra/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ GEM
ruby2_keywords (~> 0.0.1)
mysql2 (0.5.6)
nio4r (2.7.4)
passenger (6.0.26)
rack (>= 1.6.13)
rackup (>= 2.0.0)
rake (>= 12.3.3)
pg (1.5.9)
puma (6.6.0)
nio4r (~> 2.0)
Expand All @@ -56,7 +52,6 @@ GEM
rackup (2.2.1)
rack (>= 3)
raindrops (0.20.1)
rake (13.2.1)
ruby2_keywords (0.0.5)
securerandom (0.4.1)
sinatra (4.1.1)
Expand Down Expand Up @@ -85,7 +80,6 @@ DEPENDENCIES
iodine (~> 0.7)
json (~> 2.8)
mysql2 (~> 0.5)
passenger (~> 6.0)
pg (~> 1.5)
puma (~> 6.4)
rackup
Expand Down
20 changes: 0 additions & 20 deletions frameworks/Ruby/sinatra/benchmark_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,6 @@
"versus": "rack-postgres-iodine-mri",
"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": "sinatra",
"language": "Ruby",
"orm": "Full",
"platform": "Rack",
"webserver": "Passenger",
"os": "Linux",
"database_os": "Linux",
"display_name": "sinatra-postgres-passenger-mri",
"versus": "rack-postgres-passenger-mri",
"notes": ""
},
"postgres-unicorn-mri": {
"db_url": "/db",
"query_url": "/queries?queries=",
Expand Down
14 changes: 1 addition & 13 deletions frameworks/Ruby/sinatra/boot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,7 @@
ALL_IDS = ID_RANGE.to_a
QUERIES_MIN = 1
QUERIES_MAX = 500

SERVER_STRING =
if defined?(PhusionPassenger)
'passenger'
elsif defined?(Puma)
'puma'
elsif defined?(Unicorn)
'unicorn'
elsif defined?(Iodine)
'iodine'
elsif defined?(Agoo)
'agoo'
end
SERVER_STRING = "Sinatra"

Bundler.require(:default) # Load core modules

Expand Down
28 changes: 0 additions & 28 deletions frameworks/Ruby/sinatra/sinatra-postgres-passenger-mri.dockerfile
View file
Open in desktop

This file was deleted.

Loading