async-container 0.20.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2435dd48259ab4b6bbad01780c21dc91bdf2946485f1dd682c8388b9ee68410d
-  data.tar.gz: c8e3564e5c889f469658eb044444bc6884575090ed38e73f07bcffdfe893f823
+  metadata.gz: 97b99976b04ac8d7725349a23176ff2ca94643a4e95c96b6ab566a957be437d7
+  data.tar.gz: ec7aa60548299430c13b14d6abee5df28ec383b48dafb7e60432574bd07dd6fb
 SHA512:
-  metadata.gz: fa56a0207d1bab96685c25ca8f3617a5e5aefeb673998d836780baf75e1ff9ee9618ac4e506f893de206f425277a7abb0dc12f748850d59e037f5f155763b9d9
-  data.tar.gz: 1198eaa52f0ea7dfe3b411c1e6cf6866f720f9aa4b5b1913fee2fbb535144115b4e2e3e21e313fa01faa64e724e7e786e32732c0889d2c8601c8ccce72dfe967
+  metadata.gz: 8b44d6496b6b9fa16bc288ecc66f0ba0645a0b3301d2a32bf53fbf27f993803cba38b6da9208baa3ef6c14fececb9da65cda6ab8d8ae403aa04c666c4077c978
+  data.tar.gz: 61d79bd5e62d8b406ffe88aae129918b5ab7c3de779847e8295e6dff867fdc58573c68e7df7bee585b9b204c6150dd98bc82fc424c8c6643df7eedd9dbd11f7c

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-��8�r���"�D�\Rk��e�m�ܞ�v�����L�(*�i'z�X���Х��R�ƚ|R_:�����B����#duv�O�������F��ԧ��I?afW�_w�p[5zU��Qq'��>�5	&)�(�&g	�������W�j��<�h�M��FT�@J����U ��6������i��A)�F��?7 ��kM�DŽZ�Fxe��f<�*�:!�(�4/�x�@��Y*�S,�ТvX�Q��63���;�p�&j������)ў��WkXdJ�r�2e
�X�
���@�5�];�f[e�1n�R�����կ\hé�����"Xnw�]�jK&
-����	��,dz
--zE4�<��}s�J�7D]t�Đ$Z
+F�^���W5�r)� �Qgm],�EEE��-����ՃBA0��*8_�r�ۡ��ȼ�d|)��ه� ��E	w�>�(��/l2$P\O9�9���#�@R5��1%�0bHϧ

data/lib/async/container/forked.rb

@@ -41,12 +41,24 @@ module Async
 						@name = nil
 					end
 					
+					def as_json(...)
+						{
+							process_id: ::Process.pid,
+							name: @name,
+						}
+					end
+					
+					def to_json(...)
+						as_json.to_json(...)
+					end
+					
 					# Set the process title to the specified value.
 					# @parameter value [String] The name of the process.
 					def name= value
-						if @name = value
-							::Process.setproctitle(@name)
-						end
+						@name = value
+						
+						# This sets the process title to an empty string if the name is nil:
+						::Process.setproctitle(@name.to_s)
 					end
 					
 					# The name of the process.
@@ -180,6 +192,13 @@ module Async
 					end
 				end
 				
+				# Send `SIGKILL` to the child process.
+				def kill!
+					unless @status
+						::Process.kill(:KILL, @pid)
+					end
+				end
+				
 				# Send `SIGHUP` to the child process.
 				def restart!
 					unless @status

data/lib/async/container/generic.rb

@@ -172,8 +172,8 @@ module Async
 								when :health_check!
 									if health_check_timeout&.<(age_clock.total)
 										Console.warn(self, "Child failed health check!", child: child, age: age_clock.total, health_check_timeout: health_check_timeout)
-										# If the child has failed the health check, we assume the worst and terminate it (SIGTERM).
-										child.terminate!
+										# If the child has failed the health check, we assume the worst and kill it immediately:
+										child.kill!
 									end
 								else
 									state.update(message)

data/lib/async/container/threaded.rb

@@ -11,6 +11,9 @@ module Async
 	module Container
 		# A multi-thread container which uses {Thread.fork}.
 		class Threaded < Generic
+			class Kill < Exception
+			end
+			
 			# Indicates that this is not a multi-process container.
 			def self.multiprocess?
 				false
@@ -50,12 +53,23 @@ module Async
 					end
 					
 					def initialize(io)
-						@name = nil
 						@thread = ::Thread.current
 						
 						super
 					end
 					
+					def as_json(...)
+						{
+							process_id: ::Process.pid,
+							thread_id: @thread.object_id,
+							name: @thread.name,
+						}
+					end
+					
+					def to_json(...)
+						as_json.to_json(...)
+					end
+					
 					# Set the name of the thread.
 					# @parameter value [String] The name to set.
 					def name= value
@@ -178,6 +192,14 @@ module Async
 					@thread.raise(Terminate)
 				end
 				
+				# Invoke {Thread#kill} on the child thread.
+				def kill!
+					# Killing a thread does not raise an exception in the thread, so we need to handle the status here:
+					@status = Status.new(:killed)
+					
+					@thread.kill
+				end
+				
 				# Raise {Restart} in the child thread.
 				def restart!
 					@thread.raise(Restart)
@@ -230,7 +252,7 @@ module Async
 						Console.error(self) {error}
 					end
 					
-					@status = Status.new(error)
+					@status ||= Status.new(error)
 					self.close_write
 				end
 			end

data/lib/async/container/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Container
-		VERSION = "0.20.1"
+		VERSION = "0.22.0"
 	end
 end

data/readme.md

@@ -22,6 +22,10 @@ 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.21.0
+
+  - Use `SIGKILL`/`Thread#kill` when the health check fails. In some cases, `SIGTERM` may not be sufficient to terminate a process because the signal can be ignored or the process may be in an uninterruptible state.
+
 ### v0.20.1
 
   - Fix compatibility between <code class="language-ruby">Async::Container::Hybrid</code> and the health check.

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.21.0
+
+  - Use `SIGKILL`/`Thread#kill` when the health check fails. In some cases, `SIGTERM` may not be sufficient to terminate a process because the signal can be ignored or the process may be in an uninterruptible state.
+
 ## v0.20.1
 
   - Fix compatibility between {ruby Async::Container::Hybrid} and the health check.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async