async-container 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f6471fbc90b1e7f77f1309460f4c7e4430b1145e7bed34fd2d3bf0328a07e2c
-  data.tar.gz: 2c31a4e9efa968ecb8990ea75635bfc3ae1f7dfbe4206b6924083ff70e41ac22
+  metadata.gz: 9dc9673efdab7c4237e091e9efe316438d6a514b625dfbc4b9fc68d245a90d87
+  data.tar.gz: 7d48600b8d3396997101c828bea5878a3124f1449e7bbdb5467ce8fd044c6eba
 SHA512:
-  metadata.gz: e238bdbbd25338102c6e50f94ab061d54ffbe297518ed2700f8e351bb96267e651042bf7a3284c518e6954e7dca5d09c3f1ca4ef043051b4fd128c71c1fe8a42
-  data.tar.gz: c3db488f41fab5ccea99a4cc8e89fc6e79cc687b77284f65991712beb51cc8d434e248d419d94fec5aaf04c63c91bfba037243d53c5ba6aa762645244053f04e
+  metadata.gz: 0ea4840c799c1a0dbb0c68a22ea498865a34f041e7ed69596abfc0c40634d190f00202c414bac39a4154072e1300982684522da5cf5a0210a7aaedb1174b767f
+  data.tar.gz: dab62559214494aff8c4413bef634bcb0f829e0066710b2069bed339357fab44da97569eb291d32d057763072fff059064c492bea2fc35afec4d51f230def7d5

data/lib/async/container/controller.rb

@@ -22,7 +22,7 @@ module Async
 			
 			# Initialize the controller.
 			# @parameter notify [Notify::Client] A client used for process readiness notifications.
-			def initialize(notify: Notify.open!, container_class: Container)
+			def initialize(notify: Notify.open!, container_class: Container, graceful_stop: true)
 				@container = nil
 				@container_class = container_class
 				
@@ -35,6 +35,8 @@ module Async
 				trap(SIGHUP) do
 					self.restart
 				end
+				
+				@graceful_stop = graceful_stop
 			end
 			
 			# The state of the controller.
@@ -96,7 +98,7 @@ module Async
 			
 			# Stop the container if it's running.
 			# @parameter graceful [Boolean] Whether to give the children instances time to shut down or to kill them immediately.
-			def stop(graceful = true)
+			def stop(graceful = @graceful_stop)
 				@container&.stop(graceful)
 				@container = nil
 			end
@@ -130,23 +132,25 @@ module Async
 				if container.failed?
 					@notify&.error!("Container failed to start!")
 					
-					container.stop
+					container.stop(false)
 					
 					raise SetupError, container
 				end
 				
-				# Make this swap as atomic as possible:
+				# The following swap should be atomic:
 				old_container = @container
 				@container = container
+				container = nil
+				
+				if old_container
+					Console.logger.debug(self, "Stopping old container...")
+					old_container&.stop(@graceful_stop)
+				end
 				
-				Console.logger.debug(self, "Stopping old container...")
-				old_container&.stop
 				@notify&.ready!
-			rescue
+			ensure
 				# If we are leaving this function with an exception, try to kill the container:
 				container&.stop(false)
-				
-				raise
 			end
 			
 			# Reload the existing container. Children instances will be reloaded using `SIGHUP`.
@@ -163,7 +167,9 @@ module Async
 				
 				# Wait for all child processes to enter the ready state.
 				Console.logger.debug(self, "Waiting for startup...")
+				
 				@container.wait_until_ready
+				
 				Console.logger.debug(self, "Finished startup.")
 				
 				if @container.failed?
@@ -180,14 +186,17 @@ module Async
 				# I thought this was the default... but it doesn't always raise an exception unless you do this explicitly.
 				# We use `Thread.current.raise(...)` so that exceptions are filtered through `Thread.handle_interrupt` correctly.
 				interrupt_action = Signal.trap(:INT) do
+					# $stderr.puts "Received INT signal, terminating...", caller
 					::Thread.current.raise(Interrupt)
 				end
 				
 				terminate_action = Signal.trap(:TERM) do
+					# $stderr.puts "Received TERM signal, terminating...", caller
 					::Thread.current.raise(Terminate)
 				end
 				
 				hangup_action = Signal.trap(:HUP) do
+					# $stderr.puts "Received HUP signal, restarting...", caller
 					::Thread.current.raise(Hangup)
 				end
 				
@@ -209,11 +218,11 @@ module Async
 					end
 				end
 			rescue Interrupt
-				self.stop(true)
+				self.stop
 			rescue Terminate
 				self.stop(false)
 			ensure
-				self.stop(true)
+				self.stop(false)
 				
 				# Restore the interrupt handler:
 				Signal.trap(:INT, interrupt_action)

data/lib/async/container/generic.rb

@@ -161,7 +161,7 @@ module Async
 						end
 						
 						if status.success?
-							Console.logger.info(self) {"#{child} exited with #{status}"}
+							Console.logger.debug(self) {"#{child} exited with #{status}"}
 						else
 							@statistics.failure!
 							Console.logger.error(self) {status}

data/lib/async/container/group.rb

@@ -20,6 +20,10 @@ module Async
 				@queue = nil
 			end
 			
+			def inspect
+				"#<#{self.class} running=#{@running.size}>"
+			end
+			
 			# @attribute [Hash(IO, Fiber)] the running tasks, indexed by IO.
 			attr :running
 			
@@ -133,6 +137,7 @@ module Async
 			protected
 			
 			def wait_for_children(duration = nil)
+				Console.debug(self, "Waiting for children...", duration: duration)
 				if !@running.empty?
 					# Maybe consider using a proper event loop here:
 					readable, _, _ = ::IO.select(@running.keys, nil, nil, duration)

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

@@ -13,7 +13,7 @@ module Async
 			# Implements a general process readiness protocol with output to the local console.
 			class Console < Client
 				# Open a notification client attached to the current console.
-				def self.open!(logger = ::Console.logger)
+				def self.open!(logger = ::Console)
 					self.new(logger)
 				end
 				

data/lib/async/container/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module Container
-		VERSION = "0.17.0"
+		VERSION = "0.18.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-03-11 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async