Clarified some of the error messages

2 files changed, 20 insertions, 14 deletions

diff --git a/lib/chef/provider/service.rb b/lib/chef/provider/service.rb
index 04e6ee23a4..5ac53478e3 100644
--- a/lib/chef/provider/service.rb
+++ b/lib/chef/provider/service.rb
@@ -31,45 +31,53 @@ class Chef
 
       def action_enable
         if @current_resource.enabled == false
-          Chef::Log.debug("Trying to enable #{@new_resource}")
+          Chef::Log.debug("#{@new_resource}: attempting to enable")
           status = enable_service(@new_resource.service_name)
           if status
             @new_resource.enabled == true
-            Chef::Log.info("Enabled service #{@new_resource} successfully")
+            Chef::Log.info("#{@new_resource}: enabled succesfully")
           end
+        else
+          Chef::Log.debug("#{@new_resource}: not enabling, already enabled")
         end
       end
 
       def action_disable
         if @current_resource.enabled == true
-          Chef::Log.debug("Trying to disable #{@new_resource}")
+          Chef::Log.debug("#{@new_resource}: attempting to disable")
           status = disable_service(@new_resource.service_name)
           if status
             @new_resource.enabled == false
-            Chef::Log.info("Disabled service #{@new_resource} succesfully")
+            Chef::Log.info("#{@new_resource}: disabled succesfully")
           end
+        else
+          Chef::Log.debug("#{@new_resource}: not disabling, already disabled")
         end
       end
 
       def action_start
-        Chef::Log.debug("Trying to start #{@new_resource}")
         if @current_resource.running == false
+          Chef::Log.debug("#{@new_resource}: attempting to start")
           status = start_service(@new_resource.service_name)
           if status
             @new_resource.running == true
             Chef::Log.info("Started service #{@new_resource} succesfully")
           end
+        else
+          Chef::Log.debug("#{@new_resource}: not starting, already running")
         end 
       end
 
       def action_stop
-        Chef::Log.debug("Trying to start #{@new_resource}")
         if @current_resource.running == true
+          Chef::Log.debug("#{@new_resource}: attempting to stop")
           status = stop_service(@new_resource.service_name)
           if status
             @new_resource.running == false
-            Chef::Log.info("Stopped service #{@new_resource} succesfully")
+            Chef::Log.info("#{@new_resource}: stopped succesfully")
           end
+        else
+          Chef::Log.debug("#{@new_resource}: not stopping, already stopped")
         end 
       end
   
diff --git a/lib/chef/provider/service/init.rb b/lib/chef/provider/service/init.rb
index 56f07ecfb9..d50f88a4aa 100644
--- a/lib/chef/provider/service/init.rb
+++ b/lib/chef/provider/service/init.rb
@@ -32,13 +32,11 @@ class Chef
         elsif @new_resource.status_command
           run_command(:command => @new_resource.status_command) == 0 ? process_running = true : process_running = false
         else
-          Chef::Log.debug("service #{@new_resource.service_name} does not support status and you have not specified a status command, falling back to process table inspection")
-          unless @new_resource.pattern
-            raise Chef::Exception::Service, "#{@new_resource.service_name} does not support status (#{@new_resource.supports[:status]}) and no pattern specified"
-          end  
-
-          unless Facter["ps"].value != ""
-            raise Chef::Exception::Service, "Facter could not determine how to call `ps` on your system (#{Facter["ps"].value})"
+          Chef::Log.debug("#{@new_resource} does not support status and you have not specified a status command, falling back to process table inspection")
+          if @new_resource.pattern == @new_resource.service_name
+            Chef::Log.debug("#{@new_resource} defaulting pattern to #{Regex.new(@new_resource.pattern)}") 
+          elsif Facter["ps"].value == ""
+            raise Chef::Exception::Service, "#{@new_resource}: Facter could not determine how to call `ps` on your system (#{Facter["ps"].value})"
           end
 
           process_pid = nil