Upgrade to Puma 5.

stefansundin · Jan 12, 2021 · d850bfa · d850bfa
1 parent 5eba54d
commit d850bfa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/.env.example b/.env.example
@@ -1,6 +1,7 @@
 # Performance configuration:
 # MALLOC_ARENA_MAX=2
 # WEB_CONCURRENCY=2
+# MIN_THREADS=25
 # MAX_THREADS=25
 # URL_MAX_CONCURRENCY=5
 

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem "rake", require: false
 gem "irb"
 gem "rack"
 gem "sinatra"
-gem "puma", "~> 4.3"
+gem "puma"
 gem "dotenv"
 gem "redis"
 gem "addressable"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
       pry (~> 0.9)
       slop (~> 3.0)
     public_suffix (4.0.6)
-    puma (4.3.7)
+    puma (5.1.1)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -102,7 +102,7 @@ DEPENDENCIES
   powder
   prometheus-client!
   pry-remote
-  puma (~> 4.3)
+  puma
   rack
   rack-ssl-enforcer
   rake

diff --git a/config/puma.rb b/config/puma.rb
@@ -4,14 +4,8 @@
 environment(ENV["APP_ENV"])
 
 if ENV["APP_ENV"] == "development" && !ENV["WEB_CONCURRENCY"]
-  # better_errors and binding_of_caller works better with only the master process and one thread
+  # better_errors and binding_of_caller works better in single mode with only one thread
   threads(1, 1)
-else
-  ENV["WEB_CONCURRENCY"] ||= "3"
-  ENV["WEB_THREADS"] ||= "5"
-  workers(ENV["WEB_CONCURRENCY"].to_i)
-  thread_count = ENV["WEB_THREADS"].to_i
-  threads(thread_count, thread_count)
 end
 
 preload_app!