diff options
author | AJ Christensen <aj@junglist.gen.nz> | 2008-10-01 16:18:52 +1300 |
---|---|---|
committer | AJ Christensen <aj@junglist.gen.nz> | 2008-10-01 16:18:52 +1300 |
commit | 5f9dec78fa1e512334d7d4286e6b2b1f56c9a030 (patch) | |
tree | 64190d5cf3952f4affdd1347f39c979ef1ee0d13 /lib/chef/provider | |
parent | a47a258722fbc847d8517ad43a420b39de6d8f69 (diff) | |
download | chef-5f9dec78fa1e512334d7d4286e6b2b1f56c9a030.tar.gz |
Error message clarity
Diffstat (limited to 'lib/chef/provider')
-rw-r--r-- | lib/chef/provider/service/debian.rb | 10 | ||||
-rw-r--r-- | lib/chef/provider/service/init.rb | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/chef/provider/service/debian.rb b/lib/chef/provider/service/debian.rb index 4191e29e47..51597ff703 100644 --- a/lib/chef/provider/service/debian.rb +++ b/lib/chef/provider/service/debian.rb @@ -25,16 +25,10 @@ class Chef class Debian < Chef::Provider::Init def load_current_resource super - Chef::Log.debug("#{@current_resource}: currently running: #{@current_resource.running}") + status = popen4("update-rc.d -n -f #{@current_resource.service_name} remove") do |pid, stdin, stdout, stderr| stdin.close - if stdout.gets(nil) =~ /etc\/rc[\dS].d\/S|not installed/ - Chef::Log.debug("#{@current_resource} is currently enabled") - @current_resource.enabled(true) - else - Chef::Log.debug("#{@current_resource} is currently disabled") - @current_resource.enabled(false) - end + stdout.gets(nil) =~ /etc\/rc[\dS].d\/S|not installed/i ? @current_resource.enabled(true) : @current_resource.enabled(false) end unless status.exitstatus == 0 diff --git a/lib/chef/provider/service/init.rb b/lib/chef/provider/service/init.rb index d50f88a4aa..3eb70e594e 100644 --- a/lib/chef/provider/service/init.rb +++ b/lib/chef/provider/service/init.rb @@ -43,7 +43,7 @@ class Chef status = popen4(Facter["ps"].value) do |pid, stdin, stdout, stderr| stdin.close r = Regexp.new(@new_resource.pattern) - Chef::Log.debug("Attempting to match #{@new_resource.pattern} (#{r})") + Chef::Log.debug("#{@new_resource}: attempting to match #{@new_resource.pattern} (#{r}) against process table") stdout.each_line do |line| if r.match(line) process_pid = line.sub(/^\s+/, '').split(/\s+/)[1] |