Improved signal handling.

socketry · Dec 23, 2024 · 411ea4f · 411ea4f
1 parent 1b1ff07
commit 411ea4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/async/container/controller.rb b/lib/async/container/controller.rb
@@ -205,13 +205,13 @@ def run
 							end
 						end
 					end
-				rescue Interrupt
-					self.stop
-				rescue Terminate
-					self.stop(false)
-				ensure
-					self.stop(false)
 				end
+			rescue Interrupt
+				self.stop
+			rescue Terminate
+				self.stop(false)
+			ensure
+				self.stop(false)
 			end
 
 			private def with_signal_handlers
@@ -233,7 +233,7 @@ def run
 					::Thread.current.raise(Hangup)
 				end
 
-				::Thread.handle_interrupt(SignalException => :on_blocking) do
+				::Thread.handle_interrupt(SignalException => :never) do
 					yield
 				end
 			ensure

diff --git a/lib/async/container/group.rb b/lib/async/container/group.rb
@@ -150,6 +150,7 @@ def wait_for_children(duration = nil)
 				end
 			end
 
+			# Wait for a child process to exit OR a signal to be received.
 			def select(duration)
 				::Thread.handle_interrupt(SignalException => :immediate) do
 					readable, _, _ = ::IO.select(@running.keys, nil, nil, duration)