fix timeouts in passenger standalone

wrong option names were used for timeouts
phusion · Dec 12, 2024 · c7599c4 · c7599c4
1 parent 6bce94e
commit c7599c4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 Release 6.0.25 (Not yet released)
 -------------
+ * [Standalone] Changes Passenger (not app) start and stop timeouts to 25s (from 15s) except for Nginx engine mode, which retains a stop timeout of 60s.
  * 
 
 

diff --git a/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb b/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb
@@ -200,7 +200,7 @@ def build_daemon_controller_options
             :ping_command  => ping_spec,
             :pid_file      => @options[:pid_file],
             :log_file      => @options[:log_file],
-            :timeout       => 25
+            :start_timeout => 25
           }
         end
 

diff --git a/src/ruby_supportlib/phusion_passenger/standalone/status_command.rb b/src/ruby_supportlib/phusion_passenger/standalone/status_command.rb
@@ -114,8 +114,7 @@ def create_controller
           :start_command => "true", # Doesn't matter
           :ping_command  => "true", # Doesn't matter
           :pid_file      => @options[:pid_file],
-          :log_file      => "/dev/null",
-          :timeout       => 25
+          :log_file      => "/dev/null"
         )
       end
     end

diff --git a/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb b/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb
@@ -125,7 +125,7 @@ def create_controller
           :ping_command  => "true", # Doesn't matter
           :pid_file      => @options[:pid_file],
           :log_file      => "/dev/null",
-          :timeout       => 25
+          :stop_timeout  => 25
         )
       end
     end