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

Make pumactl load config/puma.rb by default

Browse source 
config/puma/#{env}.rb isn't tried because there is no environment
option for pumactl, though this could be added.
This commit is contained in:
James Le Cuirot 2015-06-11 14:13:33 +01:00
parent 75fa5fd2fd
commit dee695f0f1
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/puma/control_cli.rb
View file

@ -66,7 +66,15 @@ module Puma
command = argv.shift
@options[:command] = command if command
Puma::Configuration.new(@options).load if @options[:config_file]
unless @options[:config_file] == '-'
if @options[:config_file].nil? and File.exist?('config/puma.rb')
@options[:config_file] = 'config/puma.rb'
end
if @options[:config_file]
Puma::Configuration.new(@options).load
end
end
# check present of command
unless @options[:command]