Fixing service refreshing -- there was a problem persisting from the provider work

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1518 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 6 insertions, 7 deletions

diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
index c2980863d..29f4c2342 100755
--- a/lib/puppet/provider/service/base.rb
+++ b/lib/puppet/provider/service/base.rb
@@ -24,7 +24,6 @@ Puppet::Type.type(:service).provide :base do
             @model.fail "Either a stop command or a pattern must be specified"
         end
         ps = Facter["ps"].value
-        warning ps.inspect
         unless ps and ps != ""
             @model.fail(
                 "You must upgrade Facter to a version that includes 'ps'"
@@ -44,12 +43,6 @@ Puppet::Type.type(:service).provide :base do
         return nil
     end
 
-    # Basically just a synonym for restarting.  Used to respond
-    # to events.
-    def refresh
-        self.restart
-    end
-
     # How to restart the process.
     def restart
         if @model[:restart] or self.respond_to?(:restartcmd)
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index 427460c35..e52de1f05 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -334,6 +334,12 @@ module Puppet
                 self.configchk
             end
         end
+
+        # Basically just a synonym for restarting.  Used to respond
+        # to events.
+        def refresh
+            provider.restart
+        end
     end
 end