Skip to content

Commit caac337

Browse files
imeyerdanielsdeleo
imeyer
authored and
danielsdeleo
committed
CHEF-947 chef-solr seems to ignore the settings in server.rb file
1 parent 37f0b5b commit caac337

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

‎chef-solr/lib/chef/solr/application/solr.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ def setup_application
126126
@logfile = File.new(Chef::Config[:log_location], "a")
127127
end
128128

129-
#Chef::Log.level = Chef::Config[:log_level]
130-
Chef::Log.level = :debug
129+
Chef::Log.level = Chef::Config[:log_level]
131130

132131
# Build up a client
133132
node = Chef::Node.new

‎chef/lib/chef/application.rb‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ def run
6666
def configure_chef
6767
parse_options
6868

69+
if not File.file?(config[:config_file])
70+
Chef::Log.warn("*****************************************")
71+
Chef::Log.warn("Can not find config file: #{config[:config_file]}, using defaults.")
72+
Chef::Log.warn("*****************************************")
73+
end
74+
6975
Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file])
7076
Chef::Config.merge!(config)
7177
end

0 commit comments

Comments
 (0)