2024.11.05 08:26 4c55a1aef Puma master

MSP-Greg · Nov 5, 2024 · 3fab00d · 3fab00d
1 parent 26cc15d
commit 3fab00d
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 93 deletions.
diff --git a/puma/Puma/Cluster.html b/puma/Puma/Cluster.html
@@ -218,7 +218,7 @@ <h3 class='inherited'><a href="Runner.html" title="Puma::Runner (class)"><code>R
     <tr>
       <td colspan='2'>
         <a class='i_m ro' href="Runner.html#redirected_io%3F-instance_method" title="Puma::Runner#redirected_io? (method)">#redirected_io?</a>,
-        <a class='i_m ro' href="Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a>,
+        <a class='i_m ro deprecated' href="Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a>,
         <a class='i_m ro' href="Runner.html#test%3F-instance_method" title="Puma::Runner#test? (method)">#test?</a>
       </td>
     </tr>

diff --git a/puma/Puma/Cluster/Worker.html b/puma/Puma/Cluster/Worker.html
@@ -178,7 +178,7 @@ <h3 class='inherited'><a href="../Runner.html" title="Puma::Runner (class)"><cod
     <tr>
       <td colspan='2'>
         <a class='i_m ro' href="../Runner.html#redirected_io%3F-instance_method" title="Puma::Runner#redirected_io? (method)">#redirected_io?</a>,
-        <a class='i_m ro' href="../Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a>,
+        <a class='i_m ro deprecated' href="../Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a>,
         <a class='i_m ro' href="../Runner.html#test%3F-instance_method" title="Puma::Runner#test? (method)">#test?</a>
       </td>
     </tr>

diff --git a/puma/Puma/Configuration.html b/puma/Puma/Configuration.html
diff --git a/puma/Puma/Configuration/ConfigMiddleware.html b/puma/Puma/Configuration/ConfigMiddleware.html
@@ -78,7 +78,7 @@ <h1>Class: Puma::Configuration::ConfigMiddleware</h1>
     </tr>
     <tr class='single'>
       <td id='t2_defined_in' class='box_2'>Defined in:</td>
-      <td class='box_rel'><a class='repo' href='https://github.com/puma/puma/blob/master/lib/puma/configuration.rb#L266'>lib/puma/configuration.rb</a>      </td>
+      <td class='box_rel'><a class='repo' href='https://github.com/puma/puma/blob/master/lib/puma/configuration.rb#L271'>lib/puma/configuration.rb</a>      </td>
     </tr>
   </tbody>
 </table>
@@ -129,11 +129,11 @@ <h3 class='signature  first'>
 <div class='tags'>
 
 </div>
-  <span class='link_repo'>[&#8202;<a class='repo' href='https://github.com/puma/puma/blob/master/lib/puma/configuration.rb#L267-L270'>GitHub</a>&#8202;]</span>
+  <span class='link_repo'>[&#8202;<a class='repo' href='https://github.com/puma/puma/blob/master/lib/puma/configuration.rb#L272-L275'>GitHub</a>&#8202;]</span>
 <div class='source_code h'>
-  <pre class='lines_num' data-start='267' data-end='270'></pre>
+  <pre class='lines_num' data-start='272' data-end='275'></pre>
   <div class='lines_code'>
-<pre><span class='info file'># File 'lib/puma/configuration.rb', line 267</span></pre>
+<pre><span class='info file'># File 'lib/puma/configuration.rb', line 272</span></pre>
 <pre class='code ruby'>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span>(<span class='id identifier rubyid_config'>config</span><span class='comma'>,</span> <span class='id identifier rubyid_app'><a href="../Configuration.html#app-instance_method" title="Puma::Configuration#app (method)">app</a></span>)
@@ -150,11 +150,11 @@ <h2 class='y_details'>Instance Method Details</h2>
   <h3 class='signature  first'>
     #<strong>call</strong>(env)  
   </h3>
-  <span class='link_repo'>[&#8202;<a class='repo' href='https://github.com/puma/puma/blob/master/lib/puma/configuration.rb#L272-L275'>GitHub</a>&#8202;]</span>
+  <span class='link_repo'>[&#8202;<a class='repo' href='https://github.com/puma/puma/blob/master/lib/puma/configuration.rb#L277-L280'>GitHub</a>&#8202;]</span>
 <div class='source_code h'>
-  <pre class='lines_num' data-start='272' data-end='275'></pre>
+  <pre class='lines_num' data-start='277' data-end='280'></pre>
   <div class='lines_code'>
-<pre><span class='info file'># File 'lib/puma/configuration.rb', line 272</span></pre>
+<pre><span class='info file'># File 'lib/puma/configuration.rb', line 277</span></pre>
 <pre class='code ruby'>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_call'>call</span>(<span class='id identifier rubyid_env'>env</span>)

diff --git a/puma/Puma/Runner.html b/puma/Puma/Runner.html
diff --git a/puma/Puma/Single.html b/puma/Puma/Single.html
@@ -160,7 +160,7 @@ <h3 class='inherited'><a href="Runner.html" title="Puma::Runner (class)"><code>R
     <tr>
       <td colspan='2'>
         <a class='i_m ro' href="Runner.html#redirected_io%3F-instance_method" title="Puma::Runner#redirected_io? (method)">#redirected_io?</a>,
-        <a class='i_m ro' href="Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a>,
+        <a class='i_m ro deprecated' href="Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a>,
         <a class='i_m ro' href="Runner.html#test%3F-instance_method" title="Puma::Runner#test? (method)">#test?</a>
       </td>
     </tr>

diff --git a/puma/file.README.html b/puma/file.README.html
@@ -166,6 +166,8 @@ <h3>Clustered mode</h3>
 
 <p>Note that threads are still used in clustered mode, and the <code>-t</code> thread flag setting is per worker, so <code>-w 2 -t 16:16</code> will spawn 32 threads in total, with 16 in each worker process.</p>
 
+<p>If the <code>WEB_CONCURRENCY</code> environment variable is set to <code>&quot;auto&quot;</code> and the <code>concurrent-ruby</code> gem is available in your application, Puma will set the worker process count to the result of <a href="https://ruby-concurrency.github.io/concurrent-ruby/master/Concurrent.html#available_processor_count-class_method">available processors</a>.</p>
+
 <p>For an in-depth discussion of the tradeoffs of thread and process count settings, [see our docs]#workers-per-pod-and-other-config-issues).</p>
 
 <p>In clustered mode, Puma can &quot;preload&quot; your application. This loads all the application code <em>prior</em> to forking. Preloading reduces total memory usage of your application via an operating system feature called <a href="https://en.wikipedia.org/wiki/Copy-on-write">copy-on-write</a>.</p>

diff --git a/puma/index.html b/puma/index.html
@@ -166,6 +166,8 @@ <h3>Clustered mode</h3>
 
 <p>Note that threads are still used in clustered mode, and the <code>-t</code> thread flag setting is per worker, so <code>-w 2 -t 16:16</code> will spawn 32 threads in total, with 16 in each worker process.</p>
 
+<p>If the <code>WEB_CONCURRENCY</code> environment variable is set to <code>&quot;auto&quot;</code> and the <code>concurrent-ruby</code> gem is available in your application, Puma will set the worker process count to the result of <a href="https://ruby-concurrency.github.io/concurrent-ruby/master/Concurrent.html#available_processor_count-class_method">available processors</a>.</p>
+
 <p>For an in-depth discussion of the tradeoffs of thread and process count settings, [see our docs]#workers-per-pod-and-other-config-issues).</p>
 
 <p>In clustered mode, Puma can &quot;preload&quot; your application. This loads all the application code <em>prior</em> to forking. Preloading reduces total memory usage of your application via an operating system feature called <a href="https://en.wikipedia.org/wiki/Copy-on-write">copy-on-write</a>.</p>

diff --git a/puma/method_list.html b/puma/method_list.html
@@ -522,6 +522,7 @@
       <li><a href="Puma/ErrorLogger.html#request_title-instance_method" title="Puma::ErrorLogger#request_title (method)">#request_title</a><small>Puma::ErrorLogger</small></li>
       <li class='ro'><a href="Puma/Server.html#requests_count-instance_method" title="Puma::Server#requests_count (method)">#requests_count</a><small>Puma::Server</small></li>
       <li class='priv'><a href="Puma/Launcher/BundlePruner.html#require_paths_for_gem-instance_method" title="Puma::Launcher::BundlePruner#require_paths_for_gem (method)">#require_paths_for_gem</a><small>Puma::Launcher::BundlePruner</small></li>
+      <li class='priv'><a href="Puma/Configuration.html#require_processor_counter-instance_method" title="Puma::Configuration#require_processor_counter (method)">#require_processor_counter</a><small>Puma::Configuration</small></li>
       <li class='priv'><a href="Puma/Launcher/BundlePruner.html#require_rubygems_min_version!-instance_method" title="Puma::Launcher::BundlePruner#require_rubygems_min_version! (method)">#require_rubygems_min_version!</a><small>Puma::Launcher::BundlePruner</small></li>
       <li class='nodoc'><a href="Puma/Client.html#reset-instance_method" title="Puma::Client#reset (method)">#reset</a><small>Puma::Client</small></li>
       <li><a href="Puma/HttpParser.html#reset-instance_method" title="Puma::HttpParser#reset (method)">#reset</a><small>Puma::HttpParser</small></li>
@@ -539,7 +540,7 @@
       <li class='ro'><a href="Puma/MiniSSL/Context.html#reuse_cache_size-instance_method" title="Puma::MiniSSL::Context#reuse_cache_size (method)">#reuse_cache_size</a><small>Puma::MiniSSL::Context</small></li>
       <li class='ro'><a href="Puma/MiniSSL/Context.html#reuse_timeout-instance_method" title="Puma::MiniSSL::Context#reuse_timeout (method)">#reuse_timeout</a><small>Puma::MiniSSL::Context</small></li>
       <li><a href="Puma/NullIO.html#rewind-instance_method" title="Puma::NullIO#rewind (method)">#rewind</a><small>Puma::NullIO</small></li>
-      <li class='ro'><a href="Puma/Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a><small>Puma::Runner</small></li>
+      <li class='ro deprecated'><a href="Puma/Runner.html#ruby_engine-instance_method" title="Puma::Runner#ruby_engine (method)">#ruby_engine</a><small>Puma::Runner</small></li>
       <li><a href="Puma/CLI.html#run-instance_method" title="Puma::CLI#run (method)">#run</a><small>Puma::CLI</small></li>
       <li><a href="Puma/Cluster.html#run-instance_method" title="Puma::Cluster#run (method)">#run</a><small>Puma::Cluster</small></li>
       <li class='nodoc'><a href="Puma/Cluster/Worker.html#run-instance_method" title="Puma::Cluster::Worker#run (method)">#run</a><small>Puma::Cluster::Worker</small></li>