async-container 0.26.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5ef8adc5ee828c6c044454180bf3a0de60eca666c4fa00a9c3f6b65c3ddff6
-  data.tar.gz: 778afef1c04f76a74dd03feecc0af119890875bb3dcfcfb4526556615ee789aa
+  metadata.gz: c475605b174dc9677a89310e85b7ca28269b084469b51c6f7f5226ca39d26340
+  data.tar.gz: ccbdcaa3da1c785abdadefc3ece4ce6552ea6c418a0218229e04ab53c51b2637
 SHA512:
-  metadata.gz: 0736e1e1e2cdbed60648aac53ecf2ab258436f08f44427cc1cbc516a24a584cc9cd82449129faaf6d71a1486a3a781240de2725f6fe57a0d369ec4b6e46df4c3
-  data.tar.gz: 330e8827656fdae8a1943768519a9642f8dccd598e7c036b7b22ecf0043757ddccbb2b5fd1592c26b6112ce43e4aa29541876fe494beca186cadde096e071381
+  metadata.gz: 1f17a77ff0978894a46b5b18b4ac7e2fc2bf451d13c2c4c4a94c122cc205df90b248007ad2b1d6d4655b89257bb94d745a57aa23ed833702f811afe62dc64261
+  data.tar.gz: 7415b0fb06ccaeea5645f0cc43e098f8ea1f684fc3cc51b1e5dd22dd1b3be68eba864af8f32fe93d960af3e6205a490453c48189730371a19cf0f873cb738155

data/lib/async/container/forked.rb

@@ -235,7 +235,7 @@ module Async
 				# @returns [::Process::Status] The process exit status.
 				def wait(timeout = 0.1)
 					if @pid && @status.nil?
-						Console.debug(self, "Waiting for process to exit...", pid: @pid)
+						Console.debug(self, "Waiting for process to exit...", child: {process_id: @pid}, timeout: timeout)
 						
 						_, @status = ::Process.wait2(@pid, ::Process::WNOHANG)
 						
@@ -245,7 +245,7 @@ module Async
 							_, @status = ::Process.wait2(@pid, ::Process::WNOHANG)
 							
 							if @status.nil?
-								Console.warn(self) {"Process #{@pid} is blocking, sending kill signal..."}
+								Console.warn(self, "Process is blocking, sending kill signal...", child: {process_id: @pid}, caller: caller_locations, timeout: timeout)
 								self.kill!
 								
 								# Wait for the process to exit:
@@ -254,7 +254,7 @@ module Async
 						end
 					end
 					
-					Console.debug(self, "Process exited.", pid: @pid, status: @status)
+					Console.debug(self, "Process exited.", child: {process_id: @pid, status: @status})
 					
 					return @status
 				end

data/lib/async/container/group.rb

@@ -10,6 +10,12 @@ 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
+		
 		# Manages a group of running processes.
 		class Group
 			# Initialize an empty group.
@@ -153,7 +159,7 @@ module Async
 			# @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: 1, terminate_timeout: 1)
+			def stop(graceful = true, interrupt_timeout: INTERRUPT_TIMEOUT, terminate_timeout: TERMINATE_TIMEOUT)
 				case graceful
 				when true
 					# Use defaults.

data/lib/async/container/threaded.rb

@@ -222,10 +222,10 @@ module Async
 				# @returns [Status]
 				def wait(timeout = 0.1)
 					if @waiter
-						Console.debug(self, "Waiting for thread to exit...", timeout: timeout)
+						Console.debug(self, "Waiting for thread to exit...", child: {thread_id: @thread.object_id}, timeout: timeout)
 						
 						unless @waiter.join(timeout)
-							Console.warn(self) {"Thread #{@thread} is blocking, sending kill signal..."}
+							Console.warn(self, "Thread is blocking, sending kill signal...", child: {thread_id: @thread.object_id}, caller: caller_locations, timeout: timeout)
 							self.kill!
 							@waiter.join
 						end
@@ -233,6 +233,8 @@ module Async
 						@waiter = nil
 					end
 					
+					Console.debug(self, "Thread exited.", child: {thread_id: @thread.object_id, status: @status})
+					
 					return @status
 				end
 				

data/lib/async/container/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Container
-		VERSION = "0.26.0"
+		VERSION = "0.27.1"
 	end
 end

data/readme.md

@@ -26,6 +26,15 @@ 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.27.1
+
+  - Log caller and timeout when waiting on a child instance to exit, if it blocks.
+
+### v0.27.0
+
+  - Increased default interrupt timeout and terminate timeout to 10 seconds each.
+  - Expose `ASYNC_CONTAINER_INTERRUPT_TIMEOUT` and `ASYNC_CONTAINER_TERMINATE_TIMEOUT` environment variables for configuring default timeouts.
+
 ### v0.26.0
 
   - [Production Reliability Improvements](https://socketry.github.io/async-container/releases/index#production-reliability-improvements)

data/releases.md

@@ -1,5 +1,14 @@
 # Releases
 
+## v0.27.1
+
+  - Log caller and timeout when waiting on a child instance to exit, if it blocks.
+
+## v0.27.0
+
+  - Increased default interrupt timeout and terminate timeout to 10 seconds each.
+  - Expose `ASYNC_CONTAINER_INTERRUPT_TIMEOUT` and `ASYNC_CONTAINER_TERMINATE_TIMEOUT` environment variables for configuring default timeouts.
+
 ## v0.26.0
 
 ### Production Reliability Improvements

metadata

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