From 04dd026c062486ea205ef6baa91a860805bd1b40 Mon Sep 17 00:00:00 2001
From: jeffrey6052 <jeffrey6052@163.com>
Date: Fri, 25 Dec 2015 18:35:49 +0800
Subject: [PATCH] DSL need cli_options

use case:

$: puma -C puma.rb -d

but in puma.rb:

if @options[:daemon]  # got nil, can not work
  log_path = File.join(app_root,"log/stdout.log")
  stdout_redirect log_path , log_path
end
---
 lib/puma/configuration.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/puma/configuration.rb b/lib/puma/configuration.rb
index 475de7a8..58c4ce70 100644
--- a/lib/puma/configuration.rb
+++ b/lib/puma/configuration.rb
@@ -54,6 +54,7 @@ module Puma
     end
 
     def load
+      @conf.merge! @cli_options
       DSL.load(@conf, @cli_options[:config_file])
 
       # Load the options in the right priority