Initial support for Async::Container::Controller.

Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+# gem "async-container", path: "../async-container"
+
 group :development do
 	gem 'ruby-prof', platform: :mri
 end

examples/beer/falcon.rb

@@ -3,3 +3,5 @@
 load :rack, :self_signed_tls, :supervisor
 
 rack 'beer.localhost', :self_signed_tls
+
+supervisor

falcon.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
 	spec.add_dependency "async", "~> 1.13"
 	spec.add_dependency "async-io", "~> 1.22"
-	spec.add_dependency "async-http", "~> 0.48.0"
-	spec.add_dependency "async-container", "~> 0.14.0"
+	spec.add_dependency "async-http", "~> 0.49.0"
+	spec.add_dependency "async-container", "~> 0.15.0"
 
 	spec.add_dependency "rack", ">= 1.0"
 

lib/falcon/command/host.rb

@@ -74,6 +74,14 @@ def run(container, verbose = false)
 			def call(container = Async::Container.new)
 				container = run(container, parent&.verbose?)
 
+				Signal.trap(:USR2) do
+					replacement = run(container.class.new, parent&.verbose?)
+
+					container.stop
+
+					container = replacement
+				end
+
 				container.wait(true)
 			end
 		end

lib/falcon/command/serve.rb

@@ -22,6 +22,7 @@
 require_relative '../endpoint'
 
 require 'async/container'
+
 require 'async/io/trap'
 require 'async/io/host_endpoint'
 require 'async/io/shared_endpoint'
@@ -117,48 +118,49 @@ def run(verbose = false)
 				Async.logger.info(endpoint) do |buffer|
 					buffer.puts "Falcon v#{VERSION} taking flight! Using #{container_class} #{container_options}"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"
+					buffer.puts "- To reload configuration: kill -HUP #{Process.pid}"
 				end
 
 				debug_trap = Async::IO::Trap.new(:USR1)
 				debug_trap.ignore!
 
-				container = container_class.new
-
-				container.attach do
-					bound_endpoint.close
-				end
-
-				container.run(name: "Falcon Server", restart: true, **container_options) do |task, instance|
-					task.async do
-						if debug_trap.install!
-							Async.logger.info(instance) do
-								"- Per-process status: kill -USR1 #{Process.pid}"
+				controller = Async::Container::Controller.new(container_class: self.container_class) do |container|
+					app, _ = self.load_app(verbose)
+
+					container.run(name: "Falcon Server", restart: true, **self.container_options) do |task, instance|
+						task.async do
+							if debug_trap.install!
+								Async.logger.info(instance) do
+									"- Per-process status: kill -USR1 #{Process.pid}"
+								end
 							end
-						end
-
-						debug_trap.trap do
-							Async.logger.info(self) do |buffer|
-								task.reactor.print_hierarchy(buffer)
+							
+							debug_trap.trap do
+								Async.logger.info(self) do |buffer|
+									task.reactor.print_hierarchy(buffer)
+								end
 							end
 						end
+
+						server = Falcon::Server.new(app, bound_endpoint, endpoint.protocol, endpoint.scheme)
+
+						server.run
+
+						task.children.each(&:wait)
 					end
-
-					app, _ = load_app(verbose)
-
-					server = Falcon::Server.new(app, bound_endpoint, endpoint.protocol, endpoint.scheme)
-
-					server.run
-
-					task.children.each(&:wait)
 				end
 
-				return container
+				# container.attach do
+				# 	bound_endpoint.close
+				# end
+
+				return controller
 			end
 
 			def call
-				container = run(parent.verbose?)
+				controller = run(parent.verbose?)
 
-				container.wait
+				controller.run
 			end
 		end
 	end

lib/falcon/command/virtual.rb

@@ -91,6 +91,9 @@ def run(verbose = false)
 			def call
 				container = run(parent.verbose?)
 
+				# If we are asked to restart a given container, spawn a new container to replace the old one.
+
+
 				container.wait
 			end
 

lib/falcon/supervisor.rb

@@ -70,6 +70,12 @@ def initialize(endpoint)
 		end
 
 		def restart(message)
+			# Tell the parent of this process group to spin up a new process group/container.
+			# Wait for that to start accepting new connections.
+			# Stop accepting connections.
+			# Wait for existing connnections to drain.
+			# Terminate this process group.
+
 			signal = message[:signal] || :INT
 
 			# Sepukku:

spec/falcon/command/serve_spec.rb

@@ -29,7 +29,7 @@
 	end
 
 	it "can listen on specified port" do
-		container = command.run(true)
+		controller = command.run(true)
 
 		begin
 			Async do
@@ -42,7 +42,7 @@
 				client.close
 			end
 		ensure
-			container.stop(false)
+			controller.stop(false)
 		end
 	end
 end

spec/falcon/command/top_spec.rb

@@ -40,7 +40,6 @@
 				expect(response).to be_success
 
 				response.finish
-
 				client.close
 			end