Extra logging.

Author: samuel-williams-shopify

lib/async/container/controller.rb

@@ -91,11 +91,11 @@ def setup(container)
 			# Start the container unless it's already running.
 			def start
 				unless @container
-					Console.info(self) {"Controller starting..."}
+					Console.info(self, "Controller starting...")
 					self.restart
 				end
 
-				Console.info(self) {"Controller started..."}
+				Console.info(self, "Controller started...")
 			end
 
 			# Stop the container if it's running.
@@ -111,9 +111,9 @@ def restart
 				if @container
 					@notify&.restarting!
 
-					Console.debug(self) {"Restarting container..."}
+					Console.info(self, "Restarting container...")
 				else
-					Console.debug(self) {"Starting container..."}
+					Console.info(self, "Starting container...")
 				end
 
 				container = self.create_container
@@ -127,13 +127,14 @@ def restart
 				end
 
 				# Wait for all child processes to enter the ready state.
-				Console.debug(self, "Waiting for startup...")
+				Console.info(self, "Waiting for startup...")
 				container.wait_until_ready
-				Console.debug(self, "Finished startup.")
+				Console.info(self, "Finished startup.")
 
 				if container.failed?
 					@notify&.error!("Container failed to start!")
 
+					Console.info(self, "Stopping failed container...")
 					container.stop(false)
 
 					raise SetupError, container
@@ -145,7 +146,7 @@ def restart
 				container = nil
 
 				if old_container
-					Console.debug(self, "Stopping old container...")
+					Console.info(self, "Stopping old container...")
 					old_container&.stop(@graceful_stop)
 				end
 
@@ -168,11 +169,11 @@ def reload
 				end
 
 				# Wait for all child processes to enter the ready state.
-				Console.debug(self, "Waiting for startup...")
+				Console.info(self, "Waiting for startup...")
 
 				@container.wait_until_ready
 
-				Console.debug(self, "Finished startup.")
+				Console.info(self, "Finished startup.")
 
 				if @container.failed?
 					@notify.error!("Container failed to reload!")

lib/async/container/generic.rb

@@ -139,6 +139,8 @@ def wait_until_ready
 			# Stop the children instances.
 			# @parameter timeout [Boolean | Numeric] Whether to stop gracefully, or a specific timeout.
 			def stop(timeout = true)
+				Console.info(self, "Stopping container...", timeout: timeout, caller: caller_locations)
+
 				@running = false
 				@group.stop(timeout)
 
@@ -184,6 +186,8 @@ def spawn(name: nil, restart: false, key: nil, health_check_timeout: nil, &block
 
 						begin
 							status = @group.wait_for(child) do |message|
+								Console.info(self, "Message received from child.", child: child, message: message, running: @running)
+								
 								case message
 								when :health_check!
 									if health_check_timeout&.<(age_clock.total)
@@ -199,10 +203,10 @@ def spawn(name: nil, restart: false, key: nil, health_check_timeout: nil, &block
 						end
 
 						if status.success?
-							Console.debug(self) {"#{child} exited with #{status}"}
+							Console.info(self, "Child exited successfully.", status: status, running: @running)
 						else
 							@statistics.failure!
-							Console.error(self, status: status)
+							Console.error(self, "Child exited with error!", status: status, running: @running)
 						end
 
 						if restart
@@ -211,6 +215,11 @@ def spawn(name: nil, restart: false, key: nil, health_check_timeout: nil, &block
 							break
 						end
 					end
+				rescue => error
+					Console.error(self, "Failure during child process management!", exception: error, running: @running)
+					raise
+				ensure
+					Console.info(self, "Child process management loop exited.", running: @running)
 				end.resume
 
 				return true

lib/async/container/group.rb

@@ -232,7 +232,7 @@ def wait_for(channel)
 
 			def wait_for_children(duration = nil)
 				# This log is a big noisy and doesn't really provide a lot of useful information.
-				# Console.debug(self, "Waiting for children...", duration: duration, running: @running)
+				Console.info(self, "Waiting for children...", duration: duration, running: @running)
 
 				unless @running.empty?
 					# Maybe consider using a proper event loop here: