falcon 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 504e6916fab8a0e117d92f5278a9b5fd9c882da9e390b32884db933af61f311d
-  data.tar.gz: 1706310fa9fd8d820b005fad2fec24426828d92fdaeee5252e1f6e6fa0b6a50f
+  metadata.gz: 96425fc2402b25445c421f2d8dec1739c0f2b04701c6d47de48db140f0a55123
+  data.tar.gz: 3c6b31df8560bbf133873e9c37d9600204e2bd893b139c23a0587678c5cbe22e
 SHA512:
-  metadata.gz: 5aedf3ada69a3df6e5c4be27617e9e4de163272f992ab1915568781e808991bfa4a0ba5e35051578195975dfc776afe704c5c6d810f0691e0335e5a7600380f5
-  data.tar.gz: 816941e7cb925b12aedeb0b8cd171d4df3783eeb6b999bf73734b579fe3ae0545c7d9864ce20f1d28af69772be49ef88d44f3b2449189dfa534c56b16b42335d
+  metadata.gz: c3ce086375cceb639ba87947f286b66c1d53c2693717233bedb1f1fa2222b0b31b1747e3f39566592e508ad1f97545a5334bd5ff051c397fd7a93591a9c28dd5
+  data.tar.gz: 8bbf6a1e2717969ad54dadef79faa2566a3299069d97f675b697f1b0b5f8283419150f2430141bc6bdae09ea6272fb7a284aac44d131874c79aab3a5a24df5f2

data/README.md

@@ -49,23 +49,26 @@ The `falcon serve` command has the following options for you to use:
 ```
 $ falcon --help
 falcon [--verbose | --quiet] [-h/--help] [-v/--version] <command>
-	An asynchronous HTTP client/server toolset.
+	An asynchronous HTTP server.
 
 	[--verbose | --quiet]  Verbosity of output for debugging.
-	[-h/--help]            Print out help information.
+	[-h/--help]            Print out help information.       
 	[-v/--version]         Print out the application version.
 	<command>              One of: serve, virtual.             Default: serve
 
-	serve [-b/--bind <address>] [-p/--port <number>] [-h/--hostname <hostname>] [-c/--config <path>] [-n/--concurrency <count>] [--forked | --threaded]
+	serve [-b/--bind <address>] [-p/--port <number>] [-h/--hostname <hostname>] [-t/--timeout <duration>] [--reuse-port] [-c/--config <path>] [--forked | --threaded | --hybrid] [-n/--count <count>] [--forks <count>] [--threads <count>]
 		Run an HTTP server.
 
-		[-b/--bind <address>]       Bind to the given hostname/address                               Default: https://localhost:9292
-		[-p/--port <number>]        Override the specified port 
-		[-h/--hostname <hostname>]  Specify the hostname which would be used for certificates, etc.
-		[-c/--config <path>]        Rackup configuration file to load                                Default: config.ru 
-		[-n/--concurrency <count>]  Number of processes to start                                     Default: 8 
-		[--forked | --threaded]     Select a specific concurrency model                              Default: forked
-```
+		[-b/--bind <address>]               Bind to the given hostname/address                               Default: https://localhost:9292
+		[-p/--port <number>]                Override the specified port                                    
+		[-h/--hostname <hostname>]          Specify the hostname which would be used for certificates, etc.
+		[-t/--timeout <duration>]           Specify the maximum time to wait for blocking operations.        Default: 60                    
+		[--reuse-port]                      Enable SO_REUSEPORT if possible.                                 Default: false                 
+		[-c/--config <path>]                Rackup configuration file to load                                Default: config.ru             
+		[--forked | --threaded | --hybrid]  Select a specific parallelism model                              Default: forked                
+		[-n/--count <count>]                Number of instances to start.                                    Default: 8                     
+		[--forks <count>]                   Number of forks (hybrid only).                                 
+		[--threads <count>]                 Number of threads (hybrid only). ```
 
 To run on a different port:
 
@@ -118,7 +121,7 @@ Falcon supports `rack.hijack` for HTTP/1.x connections. You can thus use [async-
 
 #### ActionCable
 
-The `rack.hijack` functionality is compatible with ActionCable. If you use the `async` adapter, you should run falcon in threaded mode, or in forked mode with `--concurrency 1`. Otherwise, your messaging system will be distributed over several processes with no IPC mechanism. You might like to try out [async-redis](https://github.com/socketry/async-redis) as an asynchronous message bus.
+The `rack.hijack` functionality is compatible with ActionCable. If you use the `async` adapter, you should run falcon in threaded mode, or in forked mode with `--count 1`. Otherwise, your messaging system will be distributed over several processes with no IPC mechanism. You might like to try out [async-redis](https://github.com/socketry/async-redis) as an asynchronous message bus.
 
 ### Early Hints
 

data/examples/redis/config.ru

@@ -21,7 +21,7 @@ use MyApp # Then, it will get to Sinatra.
 run lambda {|env| [404, {}, []]} # Bottom of the stack, give 404.
 
 # Start server like this:
-# falcon --verbose serve --threaded --concurrency 1 --bind http://localhost:9292
+# falcon --verbose serve --threaded --count 1 --bind http://localhost:9292
 
 # Test server, e.g.:
 # time ab -n 64 -c 64 http://localhost:9292/

data/falcon.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async", "~> 1.13")
 	spec.add_dependency("async-io", "~> 1.18")
 	spec.add_dependency("async-http", "~> 0.38.0")
-	spec.add_dependency("async-container", "~> 0.9.0")
+	spec.add_dependency("async-container", "~> 0.10.0")
 	
 	spec.add_dependency("rack", ">= 1.0")
 	

data/lib/falcon/adapters/rack.rb

@@ -200,7 +200,7 @@ module Falcon
 				
 				return make_response(request, status, headers, body)
 			rescue => exception
-				@logger.error "#{exception.class}: #{exception.message}\n\t#{$!.backtrace.join("\n\t")}"
+				@logger.error(self) {exception}
 				
 				return failure_response(exception)
 			end

data/lib/falcon/adapters/response.rb

@@ -20,12 +20,15 @@
 
 require_relative 'output'
 require_relative '../version'
+require_relative '../proxy'
 
 require 'time'
 
 module Falcon
 	module Adapters
 		class Response < Async::HTTP::Response
+			IGNORE_HEADERS = Set.new(Proxy::HOP_HEADERS)
+			
 			# Append a list of newline encoded headers.
 			def self.wrap_headers(fields)
 				headers = ::HTTP::Protocol::Headers.new
@@ -36,8 +39,12 @@ module Falcon
 					# This is a quick fix, but perhaps it should be part of the protocol, because it IS valid for HTTP/1.
 					key = key.downcase
 					
-					value.to_s.split("\n").each do |part|
-						headers.add(key, part)
+					if IGNORE_HEADERS.include? key
+						Async.logger.warn("Ignoring protocol-level header: #{key}: #{value}!")
+					else
+						value.to_s.split("\n").each do |part|
+							headers.add(key, part)
+						end
 					end
 				end
 				

data/lib/falcon/command.rb

@@ -33,7 +33,7 @@ module Falcon
 		end
 		
 		class Top < Samovar::Command
-			self.description = "An asynchronous HTTP client/server toolset."
+			self.description = "An asynchronous HTTP server."
 			
 			options do
 				option '--verbose | --quiet', "Verbosity of output for debugging.", key: :logging

data/lib/falcon/command/serve.rb

@@ -42,24 +42,28 @@ module Falcon
 				
 				option '-p/--port <number>', "Override the specified port", type: Integer
 				option '-h/--hostname <hostname>', "Specify the hostname which would be used for certificates, etc."
-				option '-t/--timeout <duration>', "Specify the maximum time to wait for blocking operations.", type: Float, default: 60
+				option '-t/--timeout <duration>', "Specify the maximum time to wait for blocking operations.", type: Float, default: 60*10
 				
 				option '--reuse-port', "Enable SO_REUSEPORT if possible.", default: false
 				
 				option '-c/--config <path>', "Rackup configuration file to load", default: 'config.ru'
-				option '-n/--concurrency <count>', "Number of processes to start", default: Async::Container.hardware_concurrency, type: Integer
 				
-				option '--forked | --threaded', "Select a specific concurrency model", key: :container, default: :forked
+				option '--forked | --threaded | --hybrid', "Select a specific parallelism model", key: :container, default: :forked
+				
+				option '-n/--count <count>', "Number of instances to start.", default: Async::Container.processor_count, type: Integer
+				
+				option '--forks <count>', "Number of forks (hybrid only).", type: Integer
+				option '--threads <count>', "Number of threads (hybrid only).", type: Integer
 			end
 			
 			def container_class
 				case @options[:container]
 				when :threaded
-					require 'async/container/threaded'
 					return Async::Container::Threaded
 				when :forked
-					require 'async/container/forked'
 					return Async::Container::Forked
+				when :hybrid
+					return Async::Container::Hybrid
 				end
 			end
 			
@@ -69,29 +73,27 @@ module Falcon
 				return Server.middleware(rack_app, verbose: verbose), options
 			end
 			
-			def endpoint_options
-				# Oh, for Hash#slice(keys...)
+			def slice_options(*keys)
+				# TODO: Ruby 2.5 introduced Hash#slice
 				options = {}
 				
-				if @options.key? :hostname
-					options[:hostname] = @options[:hostname]
-				end
-				
-				if @options.key? :port
-					options[:port] = @options[:port]
-				end
-				
-				if @options.key? :reuse_port
-					options[:reuse_port] = @options[:reuse_port]
-				end
-				
-				if duration = @options[:timeout] and !duration.zero?
-					options[:timeout] = duration
+				keys.each do |key|
+					if @options.key?(key)
+						options[key] = @options[key]
+					end
 				end
 				
 				return options
 			end
 			
+			def container_options
+				slice_options(:count, :forks, :threads)
+			end
+			
+			def endpoint_options
+				slice_options(:hostname, :port, :reuse_port, :timeout)
+			end
+			
 			def client_endpoint
 				Async::HTTP::URLEndpoint.parse(@options[:bind], **endpoint_options)
 			end
@@ -109,22 +111,22 @@ module Falcon
 					Async::IO::SharedEndpoint.bound(endpoint)
 				end.wait
 				
-				Async.logger.info(endpoint) do
-					"Falcon taking flight! Using #{container_class} with concurrency: #{@options[:concurrency]}"
+				Async.logger.info(endpoint) do |buffer|
+					buffer.puts "Falcon taking flight! Using #{container_class} #{container_options}"
+					buffer.puts "- To terminate: Ctrl-C or kill #{Process.pid}"
 				end
 				
 				debug_trap = Async::IO::Trap.new(:USR1)
-				
 				debug_trap.ignore!
 				
-				if container_class.multiprocess?
-					Async.logger.info "Full status: kill -USR1 #{-Process.pid}"
-				end
+				container = container_class.new
 				
-				container_class.new(concurrency: @options[:concurrency], name: "Falcon Server") do |task, instance|
+				container.run(name: "Falcon Server", restart: true, **container_options) do |task, instance|
 					task.async do
 						if debug_trap.install!
-							Async.logger.info "Per-process status: kill -USR1 #{Process.pid}"
+							Async.logger.info(instance) do
+								"- Per-process status: kill -USR1 #{Process.pid}"
+							end
 						end
 						
 						debug_trap.trap do
@@ -140,6 +142,8 @@ module Falcon
 					
 					task.children.each(&:wait)
 				end
+				
+				return container
 			end
 			
 			def invoke(parent)

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-protocol
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement