Introduce async-container-supervisor. (#275)

Author: ioquatix

bake/falcon/supervisor.rb

@@ -4,7 +4,5 @@
 # Copyright, 2020-2025, by Samuel Williams.
 
 def restart
-	require_relative "../../lib/falcon/command/supervisor"
-	
-	Falcon::Command::Supervisor["restart"].call
+	context.lookup("async:container:supervisor:restart").call
 end

examples/hello/falcon.rb

@@ -21,7 +21,7 @@
 
 	# append preload "preload.rb"
 
-	
+	include Async::Container::Supervisor::Supervised
 end
 
 service "supervisor" do

falcon.gemspec

@@ -28,13 +28,13 @@ Gem::Specification.new do |spec|
 
 	spec.add_dependency "async"
 	spec.add_dependency "async-container", "~> 0.20"
+	spec.add_dependency "async-container-supervisor", "~> 0.4.0"
 	spec.add_dependency "async-http", "~> 0.75"
 	spec.add_dependency "async-http-cache", "~> 0.4"
 	spec.add_dependency "async-service", "~> 0.10"
 	spec.add_dependency "bundler"
 	spec.add_dependency "localhost", "~> 1.1"
 	spec.add_dependency "openssl", "~> 3.0"
-	spec.add_dependency "process-metrics", "~> 0.2"
 	spec.add_dependency "protocol-http", "~> 0.31"
 	spec.add_dependency "protocol-rack", "~> 0.7"
 	spec.add_dependency "samovar", "~> 2.3"

lib/falcon/command/supervisor.rb

@@ -8,7 +8,6 @@
 require_relative "virtual"
 require_relative "proxy"
 require_relative "redirect"
-require_relative "supervisor"
 
 require_relative "../version"
 
@@ -38,7 +37,6 @@ class Top < Samovar::Command
 				"virtual" => Virtual,
 				"proxy" => Proxy,
 				"redirect" => Redirect,
-				"supervisor" => Supervisor,
 			}, default: "serve"
 
 			# Whether verbose logging is enabled.

lib/falcon/command/top.rb

@@ -3,42 +3,18 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require_relative "../service/supervisor"
 require_relative "../environment"
 
-require "io/endpoint/unix_endpoint"
+require "async/container/supervisor"
 
 module Falcon
 	module Environment
 		# Provides an environment for hosting a supervisor which can monitor multiple applications.
 		module Supervisor
-			# The service class to use for the supervisor.
-			# @returns [Class]
-			def service_class
-				::Falcon::Service::Supervisor
-			end
-			
-			# The name of the supervisor
-			# @returns [String]
-			def name
-				"supervisor"
-			end
-			
-			# The IPC path to use for communication with the supervisor.
-			# @returns [String]
-			def ipc_path
-				::File.expand_path("supervisor.ipc", root)
-			end
-			
-			# The endpoint the supervisor will bind to.
-			# @returns [::IO::Endpoint::Generic]
-			def endpoint
-				::IO::Endpoint.unix(ipc_path)
-			end
+			include Async::Container::Supervisor::Environment
 
-			# Options to use when creating the container.
-			def container_options
-				{restart: true, count: 1, health_check_timeout: 30}
+			def monitors
+				[Async::Container::Supervisor::MemoryMonitor.new(interval: 10)]
 			end
 		end
 

lib/falcon/environment/supervisor.rb

@@ -5,6 +5,7 @@
 # Copyright, 2020, by Daniel Evans.
 
 require "async/service/generic"
+require "async/container/supervisor/supervised"
 require "async/http/endpoint"
 
 require_relative "../server"
@@ -58,6 +59,10 @@ def setup(container)
 					evaluator = @environment.evaluator
 
 					Async do |task|
+						if @environment.implements?(Async::Container::Supervisor::Supervised)
+							evaluator.make_supervised_worker(instance).run
+						end
+						
 						server = evaluator.make_server(@bound_endpoint)
 
 						server.run

lib/falcon/service/server.rb

@@ -4,6 +4,33 @@
 
   - Introduce {ruby Falcon::Environment::Server#make_server} which gives you full control over the server creation process.
 
+### Introduce `Async::Container::Supervisor`.
+
+`Async::Container::Supervisor` is a new supervisor implementation that replaces Falcon's own supervisor. This allows you to use the same supervisor for all your services, and provides a more consistent interface for managing services. The supervisor is now a separate gem, `async-container-supervisor`.
+
+By default, the supervisor does not perform any monitoring, but you may add monitoring by defining them in the service definition. For example:
+
+``` ruby
+service "hello.localhost" do
+	# Configure server...
+	
+	include Async::Container::Supervisor::Supervised
+end
+
+service "supervisor" do
+	include Async::Container::Supervisor::Environment
+	
+	monitors do
+		[
+			# Limit total memory usage to 512MiB:
+			Async::Container::Supervisor::MemoryMonitor.new(interval: 10, limit: 1024 * 1024 * 512),
+		]
+	end
+end
+```
+
+We retain the `falcon:supervisor:restart` task, but you may prefer to use `async:container:supervisor:restart` directly.
+
 ## v0.50.0
 
   - Add {ruby Falcon::Environment::Server#endpoint_options} to allow configuration of the endpoint options more easily.