falcon 0.52.4 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d52ed7de8cbcdb1a7d2841131cd02f0b89165776384ee1637693c774e724ebd
-  data.tar.gz: 4cf37f13cce0acbbbba818584e8dc6fe7ef3eb031896eab9105a1cacf9fe6421
+  metadata.gz: 7a29bc2c8b56a674c1dd385f9655d454d0c792ee1c09c512cfc2019c265c3f17
+  data.tar.gz: 3a195cf6d478834756980f39ccc580d879b0b38a6272837aa51322dad8bd0cc4
 SHA512:
-  metadata.gz: 512323cbc344f48366fb68f15b3dfa04d175519ed2e4f45f936ce937469de0ec669d5e59076a7567f688ecc8a8c6b4ab83ea62c21bee1c6842ab0070e2c72740
-  data.tar.gz: 2e2291890e67f9ba1ea9c197a44d363c89b48bd0d053a27259cf4b57a27fcfbbde0ce845cdde3ad4c0beb0054bb32d6588eeb15e53867864b6dc3922cb2088b7
+  metadata.gz: 7e9ec3a6e57f6768125efb73f99fbed1918f94665ba1635b89706fd5ca14ab074c4bcfa090f7dc290f2732142f27d94afff597a239ffcc36ce02b24278ff3a4f
+  data.tar.gz: e01aae910c60cb9bacf01949c784cedce9ecd4bd5b23c47544a0da0d347fce01a9394d9f0232abec1ed90e4f5de4a924bcf7d97c3ee81b4d569bb609292d3546

data/lib/falcon/environment/server.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2020-2025, by Samuel Williams.
 
-require "async/service/generic"
+require "async/service/managed_environment"
 require "async/http/endpoint"
 
 require_relative "../service/server"
@@ -13,6 +13,8 @@ module Falcon
 	module Environment
 		# Provides an environment for hosting a web application that uses a Falcon server.
 		module Server
+			include Async::Service::ManagedEnvironment
+			
 			# The service class to use for the proxy.
 			# @returns [Class]
 			def service_class
@@ -25,21 +27,6 @@ module Falcon
 				self.name
 			end
 			
-			# Number of instances to start. By default (when nil), uses `Etc.nprocessors`.
-			# @returns [Integer | nil]
-			def count
-				nil
-			end
-			
-			# Options to use when creating the container.
-			def container_options
-				{
-					restart: true,
-					count: self.count,
-					health_check_timeout: 30,
-				}.compact
-			end
-			
 			# The host that this server will receive connections for.
 			def url
 				"http://[::]:9292"
@@ -80,13 +67,6 @@ module Falcon
 				::Async::HTTP::Endpoint.parse(url)
 			end
 			
-			# Any scripts to preload before starting the server.
-			#
-			# @returns [Array(String)] The list of scripts to preload.
-			def preload
-				[]
-			end
-			
 			# Make a server instance using the given endpoint. The endpoint may be a bound endpoint, so we take care to specify the protocol and scheme as per the original endpoint.
 			#
 			# @parameter endpoint [IO::Endpoint] The endpoint to bind to.

data/lib/falcon/service/server.rb

@@ -4,7 +4,7 @@
 # Copyright, 2019-2025, by Samuel Williams.
 # Copyright, 2020, by Daniel Evans.
 
-require "async/service/generic"
+require "async/service/managed_service"
 require "async/container/supervisor/supervised"
 require "async/http/endpoint"
 
@@ -12,28 +12,13 @@ require_relative "../server"
 
 module Falcon
 	module Service
-		class Server < Async::Service::Generic
+		class Server < Async::Service::ManagedService
 			def initialize(...)
 				super
 				
 				@bound_endpoint = nil
 			end
 			
-			# Preload any resources specified by the environment.
-			def preload!
-				root = @evaluator.root
-				
-				if scripts = @evaluator.preload
-					scripts = Array(scripts)
-					
-					scripts.each do |path|
-						Console.logger.info(self) {"Preloading #{path}..."}
-						full_path = File.expand_path(path, root)
-						load(full_path)
-					end
-				end
-			end
-			
 			# Prepare the bound endpoint for the server.
 			def start
 				@endpoint = @evaluator.endpoint
@@ -42,47 +27,42 @@ module Falcon
 					@bound_endpoint = @endpoint.bound
 				end
 				
-				preload!
-				
 				Console.logger.info(self) {"Starting #{self.name} on #{@endpoint}"}
 				
 				super
 			end
 			
-			# Setup the container with the application instance.
-			# @parameter container [Async::Container::Generic]
-			def setup(container)
-				container_options = @evaluator.container_options
-				health_check_timeout = container_options[:health_check_timeout]
+			# Run the service logic.
+			#
+			# @parameter instance [Object] The container instance.
+			# @parameter evaluator [Environment::Evaluator] The environment evaluator.
+			# @returns [Falcon::Server] The server instance.
+			def run(instance, evaluator)
+				if evaluator.key?(:make_supervised_worker)
+					Console.warn(self, "Async::Container::Supervisor is replaced by Async::Services::Supervisor, please update your service definition.")
+					
+					evaluator.make_supervised_worker(instance).run
+				end
+				
+				server = evaluator.make_server(@bound_endpoint)
 				
-				container.run(name: self.name, **container_options) do |instance|
-					evaluator = @environment.evaluator
+				Async do |task|
+					server.run
 					
-					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
-						
-						instance.ready!
-						
-						if health_check_timeout
-							Async(transient: true) do
-								while true
-									# We only update this if the health check is enabled. Maybe we should always update it?
-									instance.name = "#{self.name} (#{server.statistics_string} L=#{Fiber.scheduler.load.round(3)})"
-									sleep(health_check_timeout / 2)
-									instance.ready!
-								end
-							end
-						end
-						
-						task.children.each(&:wait)
-					end
+					task.children.each(&:wait)
 				end
+				
+				server
+			end
+			
+			# Format the process title with server statistics.
+			#
+			# @parameter evaluator [Environment::Evaluator] The environment evaluator.
+			# @parameter server [Falcon::Server] The server instance.
+			# @returns [String] The formatted process title.
+			private def format_title(evaluator, server)
+				load = Fiber.scheduler.load.round(3)
+				"#{evaluator.name} (#{server.statistics_string} L=#{load})"
 			end
 			
 			# Close the bound endpoint.

data/lib/falcon/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2017-2025, by Samuel Williams.
 
 module Falcon
-	VERSION = "0.52.4"
+	VERSION = "0.53.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.52.4
+  version: 0.53.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.
 test_files: []