Merge branch 'pid-control-thread' of git://github.com/MSP-Greg/puma i…

…nto MSP-Greg-pid-control-thread
puma · Nov 30, 2020 · 7188ec8 · 7188ec8
2 parents 7e8b29e + 3966302
commit 7188ec8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/puma/runner.rb b/lib/puma/runner.rb
@@ -59,7 +59,7 @@ def start_control
 
       control.binder.parse [str], self, 'Starting control server'
 
-      control.run
+      control.run thread_name: 'control'
       @control = control
     end
 
@@ -85,10 +85,11 @@ def output_header(mode)
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
-      log "Puma starting in #{mode} mode..."
-      log "* Version #{Puma::Const::PUMA_VERSION} (#{ruby_engine}), codename: #{Puma::Const::CODE_NAME}"
-      log "* Min threads: #{min_t}, max threads: #{max_t}"
-      log "* Environment: #{ENV['RACK_ENV']}"
+      log "Puma starting in #{mode} mode...\n" \
+          "* Version #{Puma::Const::PUMA_VERSION} (#{ruby_engine}), codename: #{Puma::Const::CODE_NAME}\n" \
+          "* Min threads: #{min_t}, max threads: #{max_t}\n" \
+          "* Environment: #{ENV['RACK_ENV']}\n" \
+          "*         Pid: #{Process.pid}"
     end
 
     def redirected_io?

diff --git a/lib/puma/server.rb b/lib/puma/server.rb
@@ -219,7 +219,7 @@ def pool_capacity
     # up in the background to handle requests. Otherwise requests
     # are handled synchronously.
     #
-    def run(background=true)
+    def run(background=true, thread_name: 'server')
       BasicSocket.do_not_reverse_lookup = true
 
       @events.fire :state, :booting
@@ -255,7 +255,7 @@ def run(background=true)
 
       if background
         @thread = Thread.new do
-          Puma.set_thread_name "server"
+          Puma.set_thread_name thread_name
           handle_servers
         end
         return @thread