kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

Handle a config-based app properly

Browse source
This commit is contained in:
Evan Phoenix 2013-02-06 14:44:51 -08:00
parent 62d124f27a
commit c1fc54a0fe
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/puma/configuration.rb
View file

@ -71,22 +71,22 @@ module Puma
# the rackup file, and set @app. # the rackup file, and set @app.
# #
def app def app
if app = @options[:app] app = @options[:app]
return app
end
path = @options[:rackup] || DefaultRackup unless app
path = @options[:rackup] || DefaultRackup
unless File.exists?(path) unless File.exists?(path)
raise "Missing rackup file '#{path}'" raise "Missing rackup file '#{path}'"
end end
app, options = Rack::Builder.parse_file path app, options = Rack::Builder.parse_file path
@options.merge! options @options.merge! options
options.each do |key,val| options.each do |key,val|
if key.to_s[0,4] == "bind" if key.to_s[0,4] == "bind"
@options[:binds] << val @options[:binds] << val
end
end end
end end

2
test/test_config.rb
View file

@ -11,6 +11,6 @@ class TestConfigFile < Test::Unit::TestCase
app = conf.app app = conf.app
assert_equal [200, {}, ["embedded app"]], app.call(nil) assert_equal [200, {}, ["embedded app"]], app.call({})
end end
end end