resources/templates/standalone/global.erb in passenger-6.0.7 vs resources/templates/standalone/global.erb in passenger-6.0.8
- old
+ new
@@ -2,9 +2,13 @@
daemon on;
error_log '<%= @options[:log_file] %>' <% if @options[:log_level] >= LVL_DEBUG %>info<% end %>;
pid '<%= @options[:pid_file] %>';
+<% if @options[:abort_websockets_on_process_shutdown].nil? || @options[:abort_websockets_on_process_shutdown] %>
+worker_shutdown_timeout 10;
+<% end %>
+
<% if Process.euid == 0 %>
<% if @options[:user] %>
<%# Run workers as the given user. The master process will always run as root and will be able to bind to any port. %>
user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;
<% else %>