mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
85dfe8edcf
When options are passed to the Puma rack handler it is unknown if the options were set via a framework as a default or via a user. Puma currently has 3 different sources of configuration, the user via command line, the config files, and defaults. Rails 5.1+ will record the values actually specified by the user versus the values specified by the frameworks. It passes these values to the Rack handler and now it's up to Puma to do something with that information. When only framework defaults are passed it will set ``` options[:user_supplied_options] = [] ``` When one or more options are specified by the user such as `:Port` then those keys will be in the array. In that example it will look like this ``` options[:user_supplied_options] = [:Port] ``` This change is 100% backwards compatible. If the framework is older and does not pass this information then the `user_supplied_options` will not be set, in that case we assume all values are user supplied. Internally we accomplish this separation by replacing `LeveledOptions` which was a generic way of specifying options with different priorities with a more explicit `UserFileDefaultOptions` this assumes only 3 levels of options and it will use them in the order supplied (user config wins over file based config wins over defaults). Now instead of using 1 dsl to set all values, we use 3. A user dsl, a file dsl and a Configuration.new` will return all 3 DSLs to the block. It's up to the person using the block to use the correct dsl corresponding to the source of data they are getting.
58 lines
1.1 KiB
Ruby
58 lines
1.1 KiB
Ruby
# Copyright (c) 2011 Evan Phoenix
|
|
# Copyright (c) 2005 Zed A. Shaw
|
|
|
|
begin
|
|
require "bundler/setup"
|
|
rescue LoadError
|
|
end
|
|
|
|
require "net/http"
|
|
require "timeout"
|
|
require "minitest/autorun"
|
|
require "minitest/pride"
|
|
require "puma"
|
|
require "puma/detect"
|
|
|
|
$LOAD_PATH << File.expand_path("../../lib", __FILE__)
|
|
|
|
# Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
|
|
# HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
|
|
def hit(uris)
|
|
results = []
|
|
|
|
uris.each do |u|
|
|
res = nil
|
|
|
|
if u.kind_of? String
|
|
res = Net::HTTP.get(URI.parse(u))
|
|
else
|
|
url = URI.parse(u[0])
|
|
res = Net::HTTP.new(url.host, url.port).start {|h| h.request(u[1]) }
|
|
end
|
|
|
|
assert res != nil, "Didn't get a response: #{u}"
|
|
results << res
|
|
end
|
|
|
|
return results
|
|
end
|
|
|
|
module TimeoutEveryTestCase
|
|
def run(*)
|
|
if !!ENV['CI']
|
|
::Timeout.timeout(60) { super }
|
|
else
|
|
super
|
|
end
|
|
end
|
|
end
|
|
|
|
Minitest::Test.prepend TimeoutEveryTestCase
|
|
|
|
module SkipTestsBasedOnRubyEngine
|
|
def skip_on_jruby
|
|
skip "Skipped on JRuby" if Puma.jruby?
|
|
end
|
|
end
|
|
|
|
Minitest::Test.include SkipTestsBasedOnRubyEngine
|