This further normalizes the handling of init-style services (including

the redhat "service" wrapper script).  Removes special case handling of
non-zero exit code in redhat (base already did this) and centralizes
scattered @resource[:has_____] checks.  Tests that proper versions of
each are called and one level of fallbacks.

Signed-off-by: Markus Roberts <Markus@reality.com>

1 files changed, 4 insertions, 23 deletions

diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb
index 8c12782d5..211b66956 100755
--- a/lib/puppet/provider/service/redhat.rb
+++ b/lib/puppet/provider/service/redhat.rb
@@ -52,35 +52,16 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do
         end
     end
 
-    def restart
-        if @resource[:hasrestart] == :true
-            service(@resource[:name], "restart")
-        else
-            super
-        end
-    end
-
-    def status
-        if @resource[:status]
-            super
-        elsif @resource[:hasstatus] == :true
-            begin
-                service(@resource[:name], "status")
-                return :running
-            rescue
-                return :stopped
-            end
-        else
-            super
-        end
+    def initscript
+        raise Puppet::Error, "Do not directly call the init script for '%s'; use 'service' instead" % @resource[:name]
     end
 
     def statuscmd
-        [command(:service), @resource[:name], "status"]
+        (@resource[:hasstatus] == :true) && [command(:service), @resource[:name], "status"]
     end
 
     def restartcmd
-        [command(:service), @resource[:name], "restart"]
+        (@resource[:hasrestart] == :true) && [command(:service), @resource[:name], "restart"]
     end
 
     def startcmd