Adding logoutput parameter to :exec

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

1 files changed, 21 insertions, 4 deletions

diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index 07f43325b..0fec635c8 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -146,10 +146,16 @@ module Puppet
                     event = :failed_command
                 end
 
-                # and log
-                @output.split(/\n/).each { |line|
-                    self.send(loglevel, line)
-                }
+                if log = @parent[:logoutput]
+                    if log == :true
+                        log = @parent[:loglevel]
+                    end
+                    unless log == :false
+                        @output.split(/\n/).each { |line|
+                            self.send(log, line)
+                        }
+                    end
+                end
 
                 return event
             end
@@ -251,6 +257,17 @@ module Puppet
             end
         end
 
+        newparam(:logoutput) do
+            desc "Whether to log output.  Defaults to logging output at the
+                loglevel for the ``exec`` element.  Values are **true**, *false*,
+                and any legal log level."
+
+            values = [:true, :false]
+            # And all of the log levels
+            Puppet::Log.eachlevel { |level| values << level }
+            newvalues(*values)
+        end
+
         newcheck(:refreshonly) do
             desc "The command should only be run as a
                 refresh mechanism for when a dependent object is changed.  It only