increase graceful_timeout from 20 to 60 seconds and make the log mess…

…age for immediate shutdown a little more threatening
mojolicious · Jul 4, 2017 · 93e314e · 93e314e
1 parent 4d9b7f3
commit 93e314e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 
 7.35  2017-07-04
   - Removed deprecated watch attribute from Mojo::Server::Morbo.
+  - Increased default graceful_timeout from 20 to 60 seconds in
+    Mojo::Server::Prefork.
 
 7.34  2017-07-02
   - Added short attribute to Mojo::Log.

diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -8,9 +8,10 @@ use Mojo::Util 'steady_time';
 use POSIX 'WNOHANG';
 use Scalar::Util 'weaken';
 
-has accepts => 10000;
-has cleanup => 1;
-has [qw(graceful_timeout heartbeat_timeout)] => 20;
+has accepts            => 10000;
+has cleanup            => 1;
+has graceful_timeout   => 60;
+has heartbeat_timeout  => 20;
 has heartbeat_interval => 5;
 has pid_file           => sub { path(tmpdir, 'prefork.pid')->to_string };
 has workers            => 4;
@@ -123,7 +124,7 @@ sub _manage {
     $w->{force} = 1 if $graceful && $graceful + $gt <= $time;
 
     # Normal stop
-    $log->debug("Stopping worker $pid")
+    $log->debug("Stopping worker $pid immediately")
       and (kill 'KILL', $pid or $self->_stopped($pid))
       if $w->{force} || ($self->{finished} && !$graceful);
   }
@@ -376,7 +377,7 @@ a true value.
   $prefork    = $prefork->graceful_timeout(15);
 
 Maximum amount of time in seconds stopping a worker gracefully may take before
-being forced, defaults to C<20>. Note that this value should usually be a little
+being forced, defaults to C<60>. Note that this value should usually be a little
 larger than the maximum amount of time you expect any one request to take.
 
 =head2 heartbeat_interval

diff --git a/lib/Mojolicious/Command/prefork.pm b/lib/Mojolicious/Command/prefork.pm
@@ -55,7 +55,7 @@ Mojolicious::Command::prefork - Pre-fork command
                                          SOMAXCONN
     -c, --clients <number>               Maximum number of concurrent
                                          connections, defaults to 1000
-    -G, --graceful-timeout <seconds>     Graceful timeout, defaults to 20.
+    -G, --graceful-timeout <seconds>     Graceful timeout, defaults to 60.
     -I, --heartbeat-interval <seconds>   Heartbeat interval, defaults to 5
     -H, --heartbeat-timeout <seconds>    Heartbeat timeout, defaults to 20
     -h, --help                           Show this summary of available options