falcon 0.19.6 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c09541c3301a05218ed04a87672b46a5d1b715f106cea0e521a99abe08acd4b3
-  data.tar.gz: aea4dd96271c20a0ad58797a88a463302b673d3c8eb8c76637248cf7723884da
+  metadata.gz: 9b2de4bddd24124f6859b6fe9abf37624537b3d9175cab2d3925a897cab1ca30
+  data.tar.gz: ca3ca0154ec2abf520c3b2a6c0f231bc66833689236a9144ce7832e390b9a894
 SHA512:
-  metadata.gz: cedf78004e71300083ea4b514e550fac70368dde871be8942c8b37940f2c50356b76997c9f575470a4379536ee366af87876726a9a9cc677424873a44103a1a4
-  data.tar.gz: 7cef15900bcf69b2ac7a240abf08d2ca34ec84bf1d44710dc27f406ccf2aa6f6b77d5724d73a72cb0fdb11d8ce00410d6dbe0869549ffee70d3b3fa86b388f10
+  metadata.gz: aee2014818ce576facb26f073df66c15cfc866f4aa9993185d98f0ebc774547fcb043a9de72f36cbaa8c977a3cdcd6af998b4860a9ad63d3cd41676ed8a5e5aa
+  data.tar.gz: 15a9f6d3e42d5333f533b3e005d0bf6c6fcbe533814221f8ee02b47e2152b58e91da948d607ad63d45225acc76736824baf743029b44435fe315dd872c882e07

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-sudo: required
 dist: xenial
 cache: bundler
 
@@ -18,11 +17,14 @@ matrix:
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
+    - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head
     - rvm: rbx-3
   allow_failures:
+    - rvm: truffleruby
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: truffleruby
     - rvm: rbx-3

data/Gemfile

@@ -7,10 +7,10 @@ group :development do
 end
 
 group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
+	gem 'pry'
+	gem 'covered', require: 'covered/rspec' if RUBY_VERSION >= "2.6.0"
 	
-	gem 'async-process', '~> 1.1.0'
+	gem 'async-process', '~> 1.1'
 	
 	gem 'puma'
 end

data/examples/redis/Gemfile

@@ -0,0 +1,8 @@
+
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "sinatra"
+gem "falcon"
+
+gem "async-redis", ">= 0.3.1"

data/examples/redis/config.ru

@@ -0,0 +1,27 @@
+
+require 'sinatra/base'
+require 'async/redis'
+require 'async/clock'
+
+CLIENT = Async::Redis::Client.new(Async::Redis.local_endpoint)
+
+class MyApp < Sinatra::Base
+	get "/" do
+		puts "Starting BLPOP SLEEP..."
+		duration = Async::Clock.measure do
+			CLIENT.call "BLPOP", "SLEEP", 1
+		end
+		puts "Finished BLPOP SLEEP after #{duration.round(2)}s"
+		
+		"ok"
+	end
+end
+
+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
+
+# Test server, e.g.:
+# time ab -n 64 -c 64 http://localhost:9292/

data/falcon.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 
 	spec.add_dependency("http-protocol", "~> 0.10.0")
-
-	spec.add_dependency("async-io", "~> 1.9")
+	
+	spec.add_dependency("async", "~> 1.13")
+	spec.add_dependency("async-io", "~> 1.18")
 	spec.add_dependency("async-http", "~> 0.37.2")
-	spec.add_dependency("async-container", "~> 0.8.0")
+	spec.add_dependency("async-container", "~> 0.9.0")
 	
 	spec.add_dependency("rack", ">= 1.0")
 	
@@ -30,7 +31,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency "async-rspec", "~> 1.7"
 	spec.add_development_dependency "async-websocket", "~> 0.6.0"
 	
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
 end

data/lib/falcon/adapters/response.rb

@@ -47,8 +47,11 @@ module Falcon
 			def self.wrap(status, headers, body)
 				headers = wrap_headers(headers)
 				
-				headers.add('server', "falcon/#{Falcon::VERSION}")
-				headers.add('date', Time.now.httpdate)
+				# https://tools.ietf.org/html/rfc7231#section-7.4.2
+				# headers.add('server', "falcon/#{Falcon::VERSION}")
+				
+				# https://tools.ietf.org/html/rfc7231#section-7.1.1.2
+				# headers.add('date', Time.now.httpdate)
 				
 				body = Output.wrap(status, headers, body)
 				

data/lib/falcon/command.rb

@@ -24,6 +24,7 @@ require_relative 'command/virtual'
 require_relative 'version'
 
 require 'samovar'
+require 'logger'
 
 module Falcon
 	module Command

data/lib/falcon/command/serve.rb

@@ -42,6 +42,7 @@ 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 '-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
@@ -78,6 +79,10 @@ module Falcon
 					options[:port] = @options[:port]
 				end
 				
+				if duration = @options[:timeout] and !duration.zero?
+					options[:timeout] = duration
+				end
+				
 				return options
 			end
 			
@@ -96,19 +101,30 @@ module Falcon
 				
 				bound_endpoint = Async::Reactor.run do
 					Async::IO::SharedEndpoint.bound(endpoint)
-				end.result
+				end.wait
 				
-				Async.logger.info "Falcon taking flight! Binding to #{endpoint} [#{container_class} with concurrency: #{@options[:concurrency]}]"
+				Async.logger.info(endpoint) do
+					"Falcon taking flight! Using #{container_class} with concurrency: #{@options[:concurrency]}"
+				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_class.new(concurrency: @options[:concurrency], name: "Falcon Server") do |task, instance|
 					task.async do
-						debug_trap.install!
-						Async.logger.info "Send `kill -USR1 #{Process.pid}` for detailed status :)"
+						if debug_trap.install!
+							Async.logger.info "Per-process status: kill -USR1 #{Process.pid}"
+						end
 						
 						debug_trap.trap do
-							task.reactor.print_hierarchy($stderr)
+							Async.logger.info(self) do |buffer|
+								task.reactor.print_hierarchy(buffer)
+							end
 						end
 					end
 					

data/lib/falcon/verbose.rb

@@ -46,7 +46,7 @@ module Falcon
 			response = super
 			
 			statistics.wrap(response) do |statistics, error|
-				@logger.info(request.authority) {"#{statistics.object_id}] #{request.method} #{request.path} #{request.version} -> #{response.status} #{response.headers.to_h}; #{statistics.inspect}"}
+				@logger.info(request.authority) {"#{request.method} #{request.path} #{request.version} -> #{response.status} #{response.headers.to_h}; #{statistics.inspect}"}
 				
 				@logger.error(request.authority) {"#{error.class}: #{error.message}"} if error
 			end

data/lib/falcon/version.rb

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

data/tasks/benchmark.rake

@@ -17,7 +17,7 @@ namespace :benchmark do
 		servers = [
 			["puma", "--bind", host.gsub("http", "tcp")],
 			["puma", "--workers", threads.to_s, "--bind", host.gsub("http", "tcp")],
-			["falcon", "--bind", host, "--config"]
+			["falcon", "serve", "--bind", host, "--config"]
 		]
 		
 		endpoint = Async::HTTP::URLEndpoint.parse(host)
@@ -51,7 +51,7 @@ namespace :benchmark do
 						response.close
 						
 						socket.close
-					rescue Errno::ECONNREFUSED
+					rescue Errno::ECONNREFUSED, Errno::ECONNRESET
 						task.sleep 0.01
 						
 						retry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.19.6
+  version: 0.20.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2019-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-protocol
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +154,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +211,8 @@ files:
 - examples/beer/config.ru
 - examples/benchmark/config.ru
 - examples/hello/config.ru
+- examples/redis/Gemfile
+- examples/redis/config.ru
 - examples/sinatra/Gemfile
 - examples/sinatra/Gemfile.lock
 - examples/sinatra/config.ru
@@ -240,8 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.