async-container 0.17.1 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8c53ca974eedc0759ad1d030e4ccedc9aa223911a37954c1a60736ca97ec66
-  data.tar.gz: c1ea63c60f1b3d8890a9bff9bdf2ba07347bec4fb4c589da0cc6517382fa8ae5
+  metadata.gz: 7578abcb2db0aaab09b3e61f905b0a39f433521630fbc496b12e9042c25b54e7
+  data.tar.gz: ac19ef8379687387ea79a17426b3197a713c6b4b0eb5d9e86f620d931e3fe3f0
 SHA512:
-  metadata.gz: 0f5f2433accfc4f8e4f702a420df060eee14594ec03d260ce4f048349650edcd541ee7256010003a71b9164bd2ac152941c069dde5847e7e0db387b5da02a5fe
-  data.tar.gz: f352c280c2c6a5de77657e32cba0d256daa09bf0e14254a96b2e95983ed598ebdaa1f5e3e9e4d8c0029616caa29d8e83dd3e47b3382cb16a8a91e07d8081db9a
+  metadata.gz: 5f335d1a6f5b7100660b458daf3014e62b52fed0f1ab0e67fcd8b914a0a87111027241348812f236af6c35c78e20461c7592270677dc577bc3f45b06c7142fb5
+  data.tar.gz: 2309e4cec26af24d6f7af3a067858bade3db001f9ab3d0c300ff151f0489625b736e6388fa4a4c3b9c98b53d7e71d54a2e6a69ff8e9883a17d16ca1021968953

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/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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require_relative 'client'
 
@@ -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.1"
+		VERSION = "0.18.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -41,36 +41,22 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: async-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
 description:
 email:
 executables: []
@@ -103,7 +89,9 @@ files:
 homepage: https://github.com/socketry/async-container
 licenses:
 - MIT
-metadata: {}
+metadata:
+  documentation_uri: https://socketry.github.io/async-container/
+  source_code_uri: https://github.com/socketry/async-container.git
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -112,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="