Merge pull request puma#712 from yakara-ltd/pumactl-default-config

Make pumactl load config/puma.rb by default
peterkeen · Jul 14, 2015 · 02e05a8 · 02e05a8
2 parents 9da5326 + dee695f
commit 02e05a8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git 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]