Skip to content

Commit de48f4c

Browse files
committed
[ruby/sinatra] Remove passenger
Remove passenger as it is the slowest and it doesn't differentiate that much.
1 parent 7bfd8b4 commit de48f4c

File tree

10 files changed

+4
-147
lines changed

10 files changed

+4
-147
lines changed

frameworks/Ruby/sinatra-sequel/Gemfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ group :iodine, optional: true do
1717
gem 'iodine', '~> 0.7', platforms: [:ruby, :mswin], require: false
1818
end
1919

20-
group :passenger, optional: true do
21-
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
22-
end
23-
2420
group :puma, optional: true do
2521
gem 'puma', '~> 6.4', require: false
2622
end

frameworks/Ruby/sinatra-sequel/Gemfile.lock

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ GEM
1111
ruby2_keywords (~> 0.0.1)
1212
mysql2 (0.5.6)
1313
nio4r (2.7.4)
14-
passenger (6.0.26)
15-
rack (>= 1.6.13)
16-
rackup (>= 2.0.0)
17-
rake (>= 12.3.3)
1814
pg (1.5.9)
1915
puma (6.6.0)
2016
nio4r (~> 2.0)
@@ -26,10 +22,7 @@ GEM
2622
rack-session (2.1.0)
2723
base64 (>= 0.1.0)
2824
rack (>= 3.0.0)
29-
rackup (2.2.1)
30-
rack (>= 3)
3125
raindrops (0.20.1)
32-
rake (13.2.1)
3326
ruby2_keywords (0.0.5)
3427
sequel (5.90.0)
3528
bigdecimal
@@ -56,7 +49,6 @@ DEPENDENCIES
5649
iodine (~> 0.7)
5750
json (~> 2.8)
5851
mysql2 (~> 0.5)
59-
passenger (~> 6.0)
6052
pg (~> 1.5)
6153
puma (~> 6.4)
6254
sequel (~> 5.0)

frameworks/Ruby/sinatra-sequel/benchmark_config.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,6 @@
6262
"versus": "rack-sequel-postgres-iodine-mri",
6363
"notes": ""
6464
},
65-
"postgres-passenger-mri": {
66-
"db_url": "/db",
67-
"query_url": "/queries?queries=",
68-
"fortune_url": "/fortunes",
69-
"update_url": "/updates?queries=",
70-
"port": 8080,
71-
"approach": "Realistic",
72-
"classification": "Micro",
73-
"database": "Postgres",
74-
"framework": "sinatra",
75-
"language": "Ruby",
76-
"orm": "Full",
77-
"platform": "Rack",
78-
"webserver": "Passenger",
79-
"os": "Linux",
80-
"database_os": "Linux",
81-
"display_name": "sinatra-sequel-postgres-passenger-mri",
82-
"versus": "rack-sequel-postgres-passenger-mri",
83-
"notes": ""
84-
},
8565
"postgres-unicorn-mri": {
8666
"db_url": "/db",
8767
"query_url": "/queries?queries=",

frameworks/Ruby/sinatra-sequel/boot.rb

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,7 @@
88
QUERIES_MIN = 1
99
QUERIES_MAX = 500
1010
SEQUEL_NO_ASSOCIATIONS = true
11-
12-
SERVER_STRING =
13-
if defined?(PhusionPassenger)
14-
'passenger'
15-
elsif defined?(Puma)
16-
'puma'
17-
elsif defined?(Unicorn)
18-
'unicorn'
19-
elsif defined?(Iodine)
20-
'iodine'
21-
end
11+
SERVER_STRING = "Sinatra"
2212

2313
Bundler.require(:default) # Load core modules
2414

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

3525
# Determine threading/thread pool size and timeout
36-
if defined?(JRUBY_VERSION)
37-
opts[:max_connections] = (2 * Math.log(Integer(ENV.fetch('MAX_CONCURRENCY')))).floor
38-
opts[:pool_timeout] = 10
39-
elsif defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
26+
if defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
4027
opts[:max_connections] = (2 * Math.log(threads)).floor
4128
opts[:pool_timeout] = 10
42-
elsif defined?(Unicorn) || defined?(Passenger)
29+
elsif defined?(Unicorn)
4330
Sequel.single_threaded = true
4431
end
4532

frameworks/Ruby/sinatra-sequel/sinatra-sequel-postgres-passenger-mri.dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

frameworks/Ruby/sinatra/Gemfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ group :iodine, optional: true do
1616
gem 'iodine', '~> 0.7', platforms: [:ruby, :mswin], require: false
1717
end
1818

19-
group :passenger, optional: true do
20-
gem 'passenger', '~> 6.0', platforms: [:ruby, :mswin], require: false
21-
end
22-
2319
group :puma, optional: true do
2420
gem 'puma', '~> 6.4', require: false
2521
end

frameworks/Ruby/sinatra/Gemfile.lock

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ GEM
3838
ruby2_keywords (~> 0.0.1)
3939
mysql2 (0.5.6)
4040
nio4r (2.7.4)
41-
passenger (6.0.26)
42-
rack (>= 1.6.13)
43-
rackup (>= 2.0.0)
44-
rake (>= 12.3.3)
4541
pg (1.5.9)
4642
puma (6.6.0)
4743
nio4r (~> 2.0)
@@ -56,7 +52,6 @@ GEM
5652
rackup (2.2.1)
5753
rack (>= 3)
5854
raindrops (0.20.1)
59-
rake (13.2.1)
6055
ruby2_keywords (0.0.5)
6156
securerandom (0.4.1)
6257
sinatra (4.1.1)
@@ -85,7 +80,6 @@ DEPENDENCIES
8580
iodine (~> 0.7)
8681
json (~> 2.8)
8782
mysql2 (~> 0.5)
88-
passenger (~> 6.0)
8983
pg (~> 1.5)
9084
puma (~> 6.4)
9185
rackup

frameworks/Ruby/sinatra/benchmark_config.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -88,26 +88,6 @@
8888
"versus": "rack-postgres-iodine-mri",
8989
"notes": ""
9090
},
91-
"postgres-passenger-mri": {
92-
"db_url": "/db",
93-
"query_url": "/queries?queries=",
94-
"fortune_url": "/fortunes",
95-
"update_url": "/updates?queries=",
96-
"port": 8080,
97-
"approach": "Realistic",
98-
"classification": "Micro",
99-
"database": "Postgres",
100-
"framework": "sinatra",
101-
"language": "Ruby",
102-
"orm": "Full",
103-
"platform": "Rack",
104-
"webserver": "Passenger",
105-
"os": "Linux",
106-
"database_os": "Linux",
107-
"display_name": "sinatra-postgres-passenger-mri",
108-
"versus": "rack-postgres-passenger-mri",
109-
"notes": ""
110-
},
11191
"postgres-unicorn-mri": {
11292
"db_url": "/db",
11393
"query_url": "/queries?queries=",

frameworks/Ruby/sinatra/boot.rb

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,7 @@
77
ALL_IDS = ID_RANGE.to_a
88
QUERIES_MIN = 1
99
QUERIES_MAX = 500
10-
11-
SERVER_STRING =
12-
if defined?(PhusionPassenger)
13-
'passenger'
14-
elsif defined?(Puma)
15-
'puma'
16-
elsif defined?(Unicorn)
17-
'unicorn'
18-
elsif defined?(Iodine)
19-
'iodine'
20-
elsif defined?(Agoo)
21-
'agoo'
22-
end
10+
SERVER_STRING = "Sinatra"
2311

2412
Bundler.require(:default) # Load core modules
2513

frameworks/Ruby/sinatra/sinatra-postgres-passenger-mri.dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)