async-container 0.29.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d92a0a4336ea40b938ef0b8b54c7dd695f8814df486fd7d80064dbb6a131722
-  data.tar.gz: f944972f872903ce0552b72e506888f84ad9dde40c980cbd4893f59019604eef
+  metadata.gz: 84ca0883f2ae0742253c1f2bdb08c98152770c41609ed179a81f2249d9cc46f7
+  data.tar.gz: 5d551d20be155c60557783ecf4064d0d90a3748ba18d9c66324a515208671bf0
 SHA512:
-  metadata.gz: 8ae6df190c3ea6e654604bc545f07e1b76af03c3ff02dd236997a9c09035c482b060244ba349d831f74138338d72be307b214c292915185035b38de173eb6b98
-  data.tar.gz: 4f7a6913143f38ec54a9f727f3bf1c738d2f7f79bd777a90fd4302689ae0c67c15faf528f1a171387a35a07cd9e168101d928ffe062749d5f0ab71e6b0e1a05f
+  metadata.gz: fddd4b0f2ea6f459a0ad39a3e806b776abda60cb97fbface314f6f93b0690fac817b0f8b09a486aa387c1dd06dc6f6ae3c9620d146ef4e2f50318532d36ac20d
+  data.tar.gz: cd14547b2e6be8a9139bcadfbf5593e777d04d6f26f02cff4c808d9b2ba3c205e36acfc19af646dca95e2f1bd52edf9020d79461a6c5987304c28eb5bc271516

data/lib/async/container/controller.rb

@@ -134,9 +134,6 @@ module Async
 				if container.failed?
 					@notify&.error!("Container failed to start!")
 					
-					Console.info(self, "Stopping failed container...")
-					container.stop(false)
-					
 					raise SetupError, container
 				end
 				
@@ -151,9 +148,14 @@ module Async
 				end
 				
 				@notify&.ready!(size: @container.size)
+			rescue => error
+				raise
 			ensure
-				# If we are leaving this function with an exception, try to kill the container:
-				container&.stop(false)
+				# If we are leaving this function with an exception, kill the container:
+				if container
+					Console.warn(self, "Stopping failed container...", exception: error)
+					container.stop(false)
+				end
 			end
 			
 			# Reload the existing container. Children instances will be reloaded using `SIGHUP`.
@@ -222,9 +224,10 @@ module Async
 					::Thread.current.raise(Interrupt)
 				end
 				
+				# SIGTERM behaves the same as SIGINT by default.
 				terminate_action = Signal.trap(:TERM) do
-					# $stderr.puts "Received TERM signal, terminating...", caller
-					::Thread.current.raise(Terminate)
+					# $stderr.puts "Received TERM signal, interrupting...", caller
+					::Thread.current.raise(Interrupt)  # Same as SIGINT
 				end
 				
 				hangup_action = Signal.trap(:HUP) do

data/lib/async/container/forked.rb

@@ -102,7 +102,7 @@ module Async
 						::Process.fork do
 							# We use `Thread.current.raise(...)` so that exceptions are filtered through `Thread.handle_interrupt` correctly.
 							Signal.trap(:INT){::Thread.current.raise(Interrupt)}
-							Signal.trap(:TERM){::Thread.current.raise(Terminate)}
+							Signal.trap(:TERM){::Thread.current.raise(Interrupt)}  # Same as SIGINT.
 							Signal.trap(:HUP){::Thread.current.raise(Restart)}
 							
 							# This could be a configuration option:
@@ -245,7 +245,7 @@ module Async
 							_, @status = ::Process.wait2(@pid, ::Process::WNOHANG)
 							
 							if @status.nil?
-								Console.warn(self, "Process is blocking, sending kill signal...", child: {process_id: @pid}, caller: caller_locations, timeout: timeout)
+								Console.warn(self, "Process is blocking, sending kill signal...", child: {process_id: @pid}, timeout: timeout)
 								self.kill!
 								
 								# Wait for the process to exit:

data/lib/async/container/generic.rb

@@ -126,7 +126,7 @@ module Async
 					self.sleep
 					
 					if self.status?(:ready)
-						Console.logger.debug(self) do |buffer|
+						Console.debug(self) do |buffer|
 							buffer.puts "All ready:"
 							@state.each do |child, state|
 								buffer.puts "\t#{child.inspect}: #{state}"
@@ -141,7 +141,7 @@ module Async
 			# Stop the children instances.
 			# @parameter timeout [Boolean | Numeric] Whether to stop gracefully, or a specific timeout.
 			def stop(timeout = true)
-				Console.debug(self, "Stopping container...", timeout: timeout)
+				Console.info(self, "Stopping container...", timeout: timeout)
 				@running = false
 				@group.stop(timeout)
 				

data/lib/async/container/group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2025, by Samuel Williams.
+# Copyright, 2018-2026, by Samuel Williams.
 
 require "fiber"
 require "async/clock"
@@ -10,11 +10,20 @@ require_relative "error"
 
 module Async
 	module Container
-		# The default timeout for interrupting processes, before escalating to terminating.
-		INTERRUPT_TIMEOUT = ENV.fetch("ASYNC_CONTAINER_INTERRUPT_TIMEOUT", 10).to_f
-		
 		# The default timeout for terminating processes, before escalating to killing.
-		TERMINATE_TIMEOUT = ENV.fetch("ASYNC_CONTAINER_TERMINATE_TIMEOUT", 10).to_f
+		GRACEFUL_TIMEOUT = ENV.fetch("ASYNC_CONTAINER_GRACEFUL_TIMEOUT", "true").then do |value|
+			case value
+			when "true"
+				true # Default timeout for graceful termination.
+			when "false"
+				false # Immediately kill the processes.
+			else
+				value.to_f
+			end
+		end
+		
+		# The default timeout for graceful termination.
+		DEFAULT_GRACEFUL_TIMEOUT = 10.0
 		
 		# Manages a group of running processes.
 		class Group
@@ -155,50 +164,37 @@ module Async
 			# Stop all child processes with a multi-phase shutdown sequence.
 			#
 			# A graceful shutdown performs the following sequence:
-			# 1. Send SIGINT and wait up to `interrupt_timeout` seconds
-			# 2. Send SIGTERM and wait up to `terminate_timeout` seconds  
-			# 3. Send SIGKILL and wait indefinitely for process cleanup
+			# 1. Send SIGINT and wait up to `graceful` seconds if specified.
+			# 2. Send SIGKILL and wait indefinitely for process cleanup.
 			#
-			# If `graceful` is false, skips the SIGINT phase and goes directly to SIGTERM → SIGKILL.
+			# If `graceful` is true, default to `DEFAULT_GRACEFUL_TIMEOUT` (10 seconds).
+			# If `graceful` is false, skip the SIGINT phase and go directly to SIGKILL.
 			#
-			# @parameter graceful [Boolean] Whether to send SIGINT first or skip directly to SIGTERM.
-			# @parameter interrupt_timeout [Numeric | Nil] Time to wait after SIGINT before escalating to SIGTERM.
-			# @parameter terminate_timeout [Numeric | Nil] Time to wait after SIGTERM before escalating to SIGKILL.
-			def stop(graceful = true, interrupt_timeout: INTERRUPT_TIMEOUT, terminate_timeout: TERMINATE_TIMEOUT)
-				case graceful
-				when true
-					# Use defaults.
-				when false
-					interrupt_timeout = nil
-				when Numeric
-					interrupt_timeout = graceful
-					terminate_timeout = graceful
-				end
-				
-				Console.debug(self, "Stopping all processes...", interrupt_timeout: interrupt_timeout, terminate_timeout: terminate_timeout)
+			# @parameter graceful [Boolean | Numeric] Whether to send SIGINT first or skip directly to SIGKILL.
+			def stop(graceful = GRACEFUL_TIMEOUT)
+				Console.debug(self, "Stopping all processes...", graceful: graceful)
 				
 				# If a timeout is specified, interrupt the children first:
-				if interrupt_timeout
-					clock = Async::Clock.start
-					
-					# Interrupt the children:
+				if graceful
+					# Send SIGINT to the children:
 					self.interrupt
 					
-					# Wait for the children to exit:
-					self.wait_for_exit(clock, interrupt_timeout)
-				end
-				
-				if terminate_timeout and self.any?
-					clock = Async::Clock.start
+					if graceful == true
+						graceful = DEFAULT_GRACEFUL_TIMEOUT
+					end
 					
-					# If the children are still running, terminate them:
-					self.terminate
+					clock = Clock.start
 					
 					# Wait for the children to exit:
-					self.wait_for_exit(clock, terminate_timeout)
+					self.wait_for_exit(clock, graceful)
 				end
-				
+			ensure
+				# Do our best to clean up the children:
 				if any?
+					if graceful
+						Console.warn(self, "Killing processes after graceful shutdown failed...", size: self.size, clock: clock)
+					end
+					
 					self.kill
 					self.wait
 				end

data/lib/async/container/notify/pipe.rb

@@ -69,7 +69,7 @@ module Async
 					@io.flush
 				end
 				
-				private
+			private
 				
 				def environment_for(arguments)
 					# Insert or duplicate the environment hash which is the first argument:

data/lib/async/container/notify/server.rb

@@ -129,6 +129,15 @@ module Async
 							end
 						end
 					end
+					
+					# Wait until a "ready" message is received from the child process.
+					def wait_until_ready
+						while message = receive
+							if message[:ready] == true
+								return
+							end
+						end
+					end
 				end
 			end
 		end

data/lib/async/container/threaded.rb

@@ -225,7 +225,7 @@ module Async
 						Console.debug(self, "Waiting for thread to exit...", child: {thread_id: @thread.object_id}, timeout: timeout)
 						
 						unless @waiter.join(timeout)
-							Console.warn(self, "Thread is blocking, sending kill signal...", child: {thread_id: @thread.object_id}, caller: caller_locations, timeout: timeout)
+							Console.warn(self, "Thread is blocking, sending kill signal...", child: {thread_id: @thread.object_id}, timeout: timeout)
 							self.kill!
 							@waiter.join
 						end

data/lib/async/container/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Container
-		VERSION = "0.29.1"
+		VERSION = "0.30.0"
 	end
 end

data/readme.md

@@ -26,6 +26,11 @@ Please see the [project documentation](https://socketry.github.io/async-containe
 
 Please see the [project releases](https://socketry.github.io/async-container/releases/index) for all releases.
 
+### v0.30.0
+
+  - `SIGTERM` is now graceful, the same as `SIGINT`, for better compatibility with Kubernetes and systemd.
+  - `ASYNC_CONTAINER_INTERRUPT_TIMEOUT` and `ASYNC_CONTAINER_TERMINATE_TIMEOUT` are removed and replaced by `ASYNC_CONTAINER_GRACEFUL_TIMEOUT`.
+
 ### v0.29.0
 
   - Introduce `Client#healthy!` for sending health check messages.
@@ -65,10 +70,6 @@ Please see the [project releases](https://socketry.github.io/async-container/rel
 
   - [Production Reliability Improvements](https://socketry.github.io/async-container/releases/index#production-reliability-improvements)
 
-### v0.25.0
-
-  - Introduce `async:container:notify:log:ready?` task for detecting process readiness.
-
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -1,5 +1,10 @@
 # Releases
 
+## v0.30.0
+
+  - `SIGTERM` is now graceful, the same as `SIGINT`, for better compatibility with Kubernetes and systemd.
+  - `ASYNC_CONTAINER_INTERRUPT_TIMEOUT` and `ASYNC_CONTAINER_TERMINATE_TIMEOUT` are removed and replaced by `ASYNC_CONTAINER_GRACEFUL_TIMEOUT`.
+
 ## v0.29.0
 
   - Introduce `Client#healthy!` for sending health check messages.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Samuel Williams