From dee695f0f1b1f8acecd6bff0de4eddae2e51be7b Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 11 Jun 2015 14:13:33 +0100 Subject: [PATCH] Make pumactl load config/puma.rb by default config/puma/#{env}.rb isn't tried because there is no environment option for pumactl, though this could be added. --- lib/puma/control_cli.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/puma/control_cli.rb b/lib/puma/control_cli.rb index b518a0750e..5fd2a30dad 100644 --- a/lib/puma/control_cli.rb +++ b/lib/puma/control_cli.rb @@ -66,7 +66,15 @@ def initialize(argv, stdout=STDOUT, stderr=STDERR) 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]