falcon 0.42.3 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 468c75f4ca09f1475236dd60cd3210245289f3fe56ae1c8c9735124a0d58da57
-  data.tar.gz: 0a17770ff09718395672808de4039de00e7be385e97e4f1cf48221e99726c633
+  metadata.gz: deaf700b8a46f5af5e6e1151c0a0708789add0c2e66f4d6048e17da5e7da8c84
+  data.tar.gz: bac8d213a65f15c4bcc0741e86f357f1158ff2fedacb9480a00ce7ea3498de64
 SHA512:
-  metadata.gz: 0ba625f50e2155ce5dc9e16c76a1f20585d17cb79232dcfd5cb040f78d3ee0e327834849f2fce1aaee6071e2815790936c6d4e6ad18825a0a944f340a1270a0d
-  data.tar.gz: a560b603aa56a21fba8890c91aa5396768edbad9a2fd248c837eabbd1358ff81624dc675ddc46650792c68a73d29869a73b92ab91de71109b05b9cb1b3406ebb
+  metadata.gz: 40c405c0e768f68b1a4c56cbf7f155571240b30e8079051243e354596e32db76593929352ca70799d13cedd0fa1fe13afbbfb54edf6d1b0cb0c65d3edf7ea349
+  data.tar.gz: 9a94416a4b3f82cc34fe61e5b0cf1bdc23ab6c2190ed37d95ff11a9cfb4dfee204c855245d03715cd0d5b63f439451200752240bca2dce58336adc8f84b0c422

data/bake/falcon/supervisor.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-# Restart the application server via the supervisor.
+# Released under the MIT License.
+# Copyright, 2020-2023, by Samuel Williams.
+
 def restart
 	require_relative '../../lib/falcon/command/supervisor'
 	

data/changes.md

@@ -0,0 +1,22 @@
+# Changes
+
+# v0.44.0
+
+## Falcon Host
+
+`async-service` is a new gem that exposes a generic service interface on top of `async-container`. Previously, `falcon host` used `async-container` directly and `build-environment` for configuration. In order to allow for more generic service definitions and configuration, `async-service` now provides a similar interface to `build-environment` and exposes this in a way that can be used for services other tha falcon. This makes it simpler to integrate multiple services into a single application.
+
+The current configuration format uses definitions like this:
+
+```ruby
+rack 'hello.localhost', :self_signed_tls
+```
+
+This changes to:
+
+```ruby
+service 'hello.localhost' do
+	include Falcon::Environment::Rack
+	include Falcon::Environment::SelfSignedTLS
+end
+```

data/lib/falcon/command/host.rb

@@ -1,31 +1,13 @@
 # frozen_string_literal: true
 
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2019-2024, by Samuel Williams.
 
-require_relative '../controller/host'
-require_relative '../configuration'
+require_relative 'paths'
 require_relative '../version'
 
 require 'samovar'
-require 'bundler'
+require 'async/service/controller'
 
 module Falcon
 	module Command
@@ -40,28 +22,13 @@ module Falcon
 			# @attribute [Array(String)]
 			many :paths, "Service configuration paths.", default: ["falcon.rb"]
 			
+			include Paths
+			
 			# The container class to use.
 			def container_class
 				Async::Container.best_container_class
 			end
 			
-			# Generate a configuration based on the specified {paths}.
-			def configuration
-				configuration = Configuration.new
-				
-				@paths.each do |path|
-					path = File.expand_path(path)
-					configuration.load_file(path)
-				end
-				
-				return configuration
-			end
-			
-			# Prepare a new controller for the command.
-			def controller
-				Controller::Host.new(self)
-			end
-			
 			# Prepare the environment and run the controller.
 			def call
 				Console.logger.info(self) do |buffer|
@@ -71,17 +38,7 @@ module Falcon
 					buffer.puts "- To reload: kill -HUP #{Process.pid}"
 				end
 				
-				begin
-					Bundler.require(:preload)
-				rescue Bundler::GemfileNotFound
-					# Ignore.
-				end
-				
-				if GC.respond_to?(:compact)
-					GC.compact
-				end
-				
-				self.controller.run
+				Async::Service::Controller.run(self.configuration, container_class: self.container_class)
 			end
 		end
 	end

data/lib/falcon/command/paths.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2020-2023, by Samuel Williams.
 
 require_relative '../configuration'
 

data/lib/falcon/command/proxy.rb

@@ -1,26 +1,9 @@
 # frozen_string_literal: true
 
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2020-2024, by Samuel Williams.
 
-require_relative '../controller/proxy'
+require_relative '../environment/proxy'
 require_relative 'paths'
 
 require 'samovar'
@@ -48,20 +31,21 @@ module Falcon
 			
 			include Paths
 			
-			# Prepare a new controller for the command.
-			def controller
-				Controller::Proxy.new(self)
+			def environment(**options)
+				Async::Service::Environment.new(Falcon::Environment::Proxy).with(
+					root: Dir.pwd,
+					name: self.class.name,
+					verbose: self.parent&.verbose?,
+					url: @options[:bind],
+					timeout: @options[:timeout],
+					**options
+				)
 			end
 			
-			# The container class to use.
-			def container_class
-				Async::Container.best_container_class
-			end
-			
-			# Options for the container.
-			# See {Controller::Serve#setup}.
-			def container_options
-				{}
+			def configuration
+				Configuration.for(
+					self.environment(environments: super.environments)
+				)
 			end
 			
 			# Prepare the environment and run the controller.
@@ -71,9 +55,13 @@ module Falcon
 					buffer.puts "- Binding to: #{@options[:bind]}"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"
 					buffer.puts "- To reload: kill -HUP #{Process.pid}"
+					
+					self.resolved_paths.each do |path|
+						buffer.puts "- Loading configuration from #{path}"
+					end
 				end
 				
-				self.controller.run
+				Async::Service::Controller.run(self.configuration)
 			end
 			
 			# The endpoint to bind to.

data/lib/falcon/command/redirect.rb

@@ -1,26 +1,9 @@
 # frozen_string_literal: true
 
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2020-2024, by Samuel Williams.
 
-require_relative '../controller/redirect'
+require_relative '../environment/redirect'
 require_relative 'paths'
 
 require 'samovar'
@@ -46,20 +29,22 @@ module Falcon
 			
 			include Paths
 			
-			# Prepare a new controller for the command.
-			def controller
-				Controller::Redirect.new(self)
+			def environment(**options)
+				Async::Service::Environment.new(Falcon::Environment::Redirect).with(
+					root: Dir.pwd,
+					name: self.class.name,
+					verbose: self.parent&.verbose?,
+					url: @options[:bind],
+					redirect_url: @options[:redirect],
+					timeout: @options[:timeout],
+					**options
+				)
 			end
 			
-			# The container class to use.
-			def container_class
-				Async::Container.best_container_class
-			end
-			
-			# Options for the container.
-			# See {Controller::Serve#setup}.
-			def container_options
-				{}
+			def configuration
+				Configuration.for(
+					self.environment(environments: super.environments)
+				)
 			end
 			
 			# Prepare the environment and run the controller.
@@ -69,9 +54,13 @@ module Falcon
 					buffer.puts "- Binding to: #{@options[:bind]}"
 					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"
 					buffer.puts "- To reload: kill -HUP #{Process.pid}"
+					
+					self.resolved_paths.each do |path|
+						buffer.puts "- Loading configuration from #{path}"
+					end
 				end
 				
-				self.controller.run
+				Async::Service::Controller.run(self.configuration)
 			end
 			
 			# The endpoint to bind to.

data/lib/falcon/command/serve.rb

@@ -1,42 +1,19 @@
 # frozen_string_literal: true
 
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018, by Mitsutaka Mimura.
 
 require_relative '../server'
 require_relative '../endpoint'
-require_relative '../controller/serve'
+require_relative '../configuration'
+require_relative '../service/server'
+require_relative '../environment/rackup'
 
 require 'async/container'
-
-require 'async/io/trap'
-require 'async/io/host_endpoint'
-require 'async/io/shared_endpoint'
-require 'async/io/ssl_endpoint'
-
+require 'async/http/client'
 require 'samovar'
 
-require 'rack/builder'
-
-require 'bundler'
-
 module Falcon
 	module Command
 		# Implements the `falcon serve` command. Designed for *development*.
@@ -67,6 +44,42 @@ module Falcon
 				option '--threads <count>', "Number of threads (hybrid only).", type: Integer
 			end
 			
+			def container_options
+				@options.slice(:count, :forks, :threads)
+			end
+			
+			def endpoint_options
+				@options.slice(:hostname, :port, :timeout)
+			end
+			
+			def environment
+				Async::Service::Environment.new(Falcon::Environment::Server).with(
+					Falcon::Environment::Rackup,
+					
+					root: Dir.pwd,
+					
+					verbose: self.parent&.verbose?,
+					cache: @options[:cache],
+					
+					container_options: self.container_options,
+					endpoint_options: self.endpoint_options,
+					
+					rackup_path: @options[:config],
+					preload: [@options[:preload]].compact,
+					url: @options[:bind],
+					
+					name: "server",
+					
+					endpoint: ->{Endpoint.parse(url, **endpoint_options)}
+				)
+			end
+			
+			def configuration
+				Configuration.new.tap do |configuration|
+					configuration.add(self.environment)
+				end
+			end
+			
 			# The container class to use.
 			def container_class
 				case @options[:container]
@@ -79,37 +92,6 @@ module Falcon
 				end
 			end
 			
-			# Whether verbose logging is enabled.
-			# @returns [Boolean]
-			def verbose?
-				@parent&.verbose?
-			end
-			
-			# Whether to enable the application HTTP cache.
-			# @returns [Boolean]
-			def cache?
-				@options[:cache]
-			end
-			
-			# Load the rack application from the specified configuration path.
-			# @returns [Protocol::HTTP::Middleware]
-			def load_app
-				rack_app, _ = Rack::Builder.parse_file(@options[:config])
-				
-				return Server.middleware(rack_app, verbose: self.verbose?, cache: self.cache?)
-			end
-			
-			# Options for the container.
-			# See {Controller::Serve#setup}.
-			def container_options
-				@options.slice(:count, :forks, :threads)
-			end
-			
-			# Options for the {endpoint}.
-			def endpoint_options
-				@options.slice(:hostname, :port, :reuse_port, :timeout)
-			end
-			
 			# The endpoint to bind to.
 			def endpoint
 				Endpoint.parse(@options[:bind], **endpoint_options)
@@ -125,11 +107,6 @@ module Falcon
 				Async::HTTP::Client.new(client_endpoint)
 			end
 			
-			# Prepare a new controller for the command.
-			def controller
-				Controller::Serve.new(self)
-			end
-			
 			# Prepare the environment and run the controller.
 			def call
 				Console.logger.info(self) do |buffer|
@@ -139,22 +116,7 @@ module Falcon
 					buffer.puts "- To reload configuration: kill -HUP #{Process.pid}"
 				end
 				
-				if path = @options[:preload]
-					full_path = File.expand_path(path)
-					load(full_path)
-				end
-				
-				begin
-					Bundler.require(:preload)
-				rescue Bundler::GemfileNotFound
-					# Ignore.
-				end
-				
-				if GC.respond_to?(:compact)
-					GC.compact
-				end
-				
-				self.controller.run
+				Async::Service::Controller.run(self.configuration, container_class: self.container_class)
 			end
 		end
 	end

data/lib/falcon/command/supervisor.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'samovar'
 require 'async'

data/lib/falcon/command/top.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require_relative 'serve'
 require_relative 'host'

data/lib/falcon/command/virtual.rb

@@ -1,26 +1,9 @@
 # frozen_string_literal: true
 
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require_relative '../controller/virtual'
+require_relative '../service/virtual'
 require_relative 'paths'
 
 require 'samovar'
@@ -47,26 +30,20 @@ module Falcon
 			# @attribute [Array(String)]
 			many :paths
 			
-			include Paths
-			
-			# Prepare a new controller for the command.
-			def controller
-				Controller::Virtual.new(self)
-			end
-			
-			# The URI to bind the `HTTPS` -> `falcon host` proxy.
-			def bind_secure
-				@options[:bind_secure]
+			def environment
+				Async::Service::Environment.new(Falcon::Service::Virtual::Environment).with(
+					verbose: self.parent&.verbose?,
+					configuration_paths: self.paths,
+					bind_insecure: @options[:bind_insecure],
+					bind_secure: @options[:bind_secure],
+					timeout: @options[:timeout],
+				)
 			end
 			
-			# The URI to bind the `HTTP` -> `HTTPS` redirector.
-			def bind_insecure
-				@options[:bind_insecure]
-			end
-			
-			# The connection timeout to use for incoming connections.
-			def timeout
-				@options[:timeout]
+			def configuration
+				Async::Service::Configuration.new.tap do |configuration|
+					configuration.add(self.environment)
+				end
 			end
 			
 			# Prepare the environment and run the controller.
@@ -77,9 +54,7 @@ module Falcon
 					buffer.puts "- To reload all sites: kill -HUP #{Process.pid}"
 				end
 				
-				ENV['CONSOLE_LEVEL'] = 'debug'
-				
-				self.controller.run
+				Async::Service::Controller.run(self.configuration)
 			end
 			
 			# The insecure endpoint for connecting to the {Redirect} instance.

data/lib/falcon/command.rb

@@ -1,24 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Released under the MIT License.
+# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2018, by Mitsutaka Mimura.
 
 require_relative 'command/top'