Skip to content

Commit

Permalink
fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
jalevin committed Apr 13, 2020
1 parent d8b72e8 commit d24455c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions lib/puma/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ def initialize(user_options={}, default_options = {}, &block)
@file_dsl = DSL.new(@options.file_options, self)
@default_dsl = DSL.new(@options.default_options, self)

# 1. workers_supported - #Puma::Plugin.new.workers_supported?)
workers_supported = !(Puma.jruby? || Puma.windows?)
# 1. workers_supported - #Puma::Plugin.new.workers_supported?)
workers_supported = !(Puma.jruby? || Puma.windows?)

# 2. preload app
if !@options[:prune_bundler]
default_options[:preload_app] =(@options[:workers] > 1) && workers_supported
end
# 2. preload app
if !@options[:prune_bundler]
default_options[:preload_app] =(@options[:workers] > 1) && workers_supported
end

if block
configure(&block)
Expand Down
8 changes: 4 additions & 4 deletions test/test_cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_control_for_tcp
body = s.read
s.close

dmt = Puma::Configuration.new.default_max_threads
dmt = Puma::Configuration.new.default_max_threads
assert_match(/{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":#{dmt},"max_threads":#{dmt},"requests_count":0}/, body.split(/\r?\n/).last)

ensure
Expand Down Expand Up @@ -88,8 +88,8 @@ def test_control_for_ssl
body = http.request(req).body
end

dmt = Puma::Configuration.new.default_max_threads
expected_stats = /{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":#{dmt},"max_threads":#{dmt}/
dmt = Puma::Configuration.new.default_max_threads
expected_stats = /{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":#{dmt},"max_threads":#{dmt}/
assert_match(expected_stats, body.split(/\r?\n/).last)
assert_equal([:started_at, :backlog, :running, :pool_capacity, :max_threads, :requests_count], Puma.stats.keys)

Expand Down Expand Up @@ -169,7 +169,7 @@ def test_control
body = s.read
s.close

dmt = Puma::Configuration.new.default_max_threads
dmt = Puma::Configuration.new.default_max_threads
assert_match(/{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":#{dmt},"max_threads":#{dmt},"requests_count":0}/, body.split("\r\n").last)
ensure
if UNIX_SKT_EXIST
Expand Down

0 comments on commit d24455c

Please sign in to comment.