falcon 0.32.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19fc217c5ab4d9c7e1b888d46366843e3d549c4d771cec14f0f17a4578144be8
-  data.tar.gz: fbb6d14f55d0fb392a98edcc4381a54db624376e3d40d0a5db4ba70ae9ccb9e4
+  metadata.gz: c80289856ac260e9a3e423465926308c76630cdb6d9d6940f147e2f643af638a
+  data.tar.gz: 0dc95d7527f64b6bc8ae6de7bfaa5f9eb5c36c26a40d6b4d318d2c63a354f4c2
 SHA512:
-  metadata.gz: 8a66a5a99d8902246e058565ee11023fad33dfe8a5909271e3536d43cc6a5d439b664142df4a82c83791f04ea86a631ea06f957fdf18b181818af8a6871d688e
-  data.tar.gz: 23c44cee1313788820af52e6787efe5157a7d228bd7032b77125a6f6d226d72576bf32073c35cdf78a1db05a466457ea14685dc110766eddbbe29950894857e3
+  metadata.gz: 8cde639a3858513ccdd80c8192d9158f75973375ecf2d66b468d18943da3e6f490cb9edaf3c94cb96b5494e140287c71545f41c806fbd4bba28e88f5f77ad43a
+  data.tar.gz: edb463f74426954aa1a71788060cdda534d4ce9ae147a4f42899f1251e669644ed5be5ab4e9e22d7f17f24158d4d9ffedc1659f38a4cbaa3c0d3695a41961fa6

data/falcon.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async", "~> 1.13"
 	spec.add_dependency "async-io", "~> 1.22"
 	spec.add_dependency "async-http", "~> 0.43.0"
-	spec.add_dependency "async-container", "~> 0.12.0"
+	spec.add_dependency "async-container", "~> 0.14.0"
 	
 	spec.add_dependency "rack", ">= 1.0"
 	

data/lib/falcon/command/host.rb

@@ -69,7 +69,7 @@ module Falcon
 				
 				container = run(container, parent.verbose?)
 				
-				container.wait
+				container.wait(true)
 			end
 		end
 	end

data/lib/falcon/command/serve.rb

@@ -119,6 +119,10 @@ module Falcon
 				
 				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!

data/lib/falcon/host.rb

@@ -0,0 +1,98 @@
+# 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.
+
+require 'async/io/endpoint'
+
+require_relative 'proxy'
+require_relative 'redirection'
+
+require 'async/container'
+require 'async/container/controller'
+require 'async/http/endpoint'
+
+module Falcon
+	class Host
+		def initialize(environment)
+			@environment = environment.flatten
+			@evaluator = @environment.evaluator
+		end
+		
+		def name
+			"Falcon Host for #{self.authority}"
+		end
+		
+		def authority
+			@evaluator.authority
+		end
+		
+		def endpoint
+			@evaluator.endpoint
+		end
+		
+		def ssl_context
+			@evaluator.ssl_context
+		end
+		
+		def root
+			@evaluator.root
+		end
+		
+		def bound_endpoint
+			@evaluator.bound_endpoint
+		end
+		
+		def to_s
+			"\#<#{self.class} #{@evaluator.authority}>"
+		end
+		
+		def assume_privileges(path)
+			stat = File.stat(path)
+			
+			Process::GID.change_privilege(stat.gid)
+			Process::UID.change_privilege(stat.uid)
+		end
+		
+		def spawn(container)
+			container.spawn(name: self.name, restart: true) do |instance|
+				path = File.join(self.root, "falcon.rb")
+				
+				assume_privileges(path)
+				
+				instance.exec("bundle", "exec", path)
+			end
+		end
+		
+		def run(container)
+			if @environment.include?(:server)
+				bound_endpoint = self.bound_endpoint
+				
+				container.run(name: self.name, restart: true) do |task, instance|
+					Async.logger.info(self) {"Starting application server..."}
+					
+					server = @evaluator.server
+					
+					server.run
+					
+					task.children.each(&:wait)
+				end
+			end
+		end
+	end
+end

data/lib/falcon/hosts.rb

@@ -20,6 +20,7 @@
 
 require 'async/io/endpoint'
 
+require_relative 'host'
 require_relative 'proxy'
 require_relative 'redirection'
 
@@ -28,74 +29,6 @@ require 'async/container/controller'
 require 'async/http/endpoint'
 
 module Falcon
-	class Host
-		def initialize(environment)
-			@environment = environment.flatten
-			@evaluator = @environment.evaluator
-		end
-		
-		def name
-			"Falcon Host for #{self.authority}"
-		end
-		
-		def authority
-			@evaluator.authority
-		end
-		
-		def endpoint
-			@evaluator.endpoint
-		end
-		
-		def ssl_context
-			@evaluator.ssl_context
-		end
-		
-		def root
-			@evaluator.root
-		end
-		
-		def bound_endpoint
-			@evaluator.bound_endpoint
-		end
-		
-		def to_s
-			"\#<#{self.class} #{@evaluator.authority}>"
-		end
-		
-		def assume_privileges(path)
-			stat = File.stat(path)
-			
-			Process::GID.change_privilege(stat.gid)
-			Process::UID.change_privilege(stat.uid)
-		end
-		
-		def spawn(container)
-			container.spawn(name: self.name, restart: true) do |instance|
-				path = File.join(self.root, "falcon.rb")
-				
-				assume_privileges(path)
-				
-				instance.exec("bundle", "exec", path)
-			end
-		end
-		
-		def run(container)
-			if @environment.include?(:server)
-				bound_endpoint = self.bound_endpoint
-				
-				container.run(name: self.name, restart: true) do |task, instance|
-					Async.logger.info(self) {"Starting application server..."}
-					
-					server = @evaluator.server
-					
-					server.run
-					
-					task.children.each(&:wait)
-				end
-			end
-		end
-	end
-	
 	class Hosts
 		DEFAULT_ALPN_PROTOCOLS = ['h2', 'http/1.1'].freeze
 		SERVER_CIPHERS = "EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5".freeze
@@ -166,7 +99,7 @@ module Falcon
 			Redirection.new(Falcon::BadRequest, @named, secure_endpoint)
 		end
 		
-		def run(container = Async::Container::Forked.new, **options)
+		def run(container = Async::Container.new, **options)
 			@named.each do |name, host|
 				host.spawn(container)
 			end
@@ -197,6 +130,11 @@ module Falcon
 				redirection_server.run
 			end
 			
+			container.attach do
+				secure_endpoint_bound.close
+				insecure_endpoint_bound.close
+			end
+			
 			return container
 		end
 	end

data/lib/falcon/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.32.0"
+	VERSION = "0.32.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -283,6 +283,7 @@ files:
 - lib/falcon/command/virtual.rb
 - lib/falcon/configuration.rb
 - lib/falcon/endpoint.rb
+- lib/falcon/host.rb
 - lib/falcon/hosts.rb
 - lib/falcon/proxy.rb
 - lib/falcon/redirection.rb