diff options
author | Luke Kanies <luke@madstop.com> | 2008-10-27 23:22:03 -0500 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2008-10-28 15:42:35 +1100 |
commit | 42cac73a7ce531e125c1c94f7bd942d9002e5445 (patch) | |
tree | ad7020f27dca97fb5e41374e217108d649ad7c8b /lib/puppet | |
parent | 6ab4f1b0e2a3f5881d865ca181c053c64d5026a7 (diff) | |
download | puppet-42cac73a7ce531e125c1c94f7bd942d9002e5445.tar.gz puppet-42cac73a7ce531e125c1c94f7bd942d9002e5445.tar.xz puppet-42cac73a7ce531e125c1c94f7bd942d9002e5445.zip |
Fixing #1698 - all logs again show up in the report.
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/util/log.rb | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb index 0dfd36dfa..b57faad42 100644 --- a/lib/puppet/util/log.rb +++ b/lib/puppet/util/log.rb @@ -369,11 +369,7 @@ class Puppet::Util::Log end def handle(msg) - # Only add messages from objects, since anything else is - # probably unrelated to this run. - if msg.objectsource? - @report.newlog(msg) - end + @report.newlog(msg) end end @@ -505,15 +501,6 @@ class Puppet::Util::Log Log.newmessage(self) end - # Was the source of this log a Puppet resource or parameter? - def objectsource? - if defined? @objectsource and @objectsource - @objectsource - else - false - end - end - # If they pass a source in to us, we make sure it is a string, and # we retrieve any tags we can. def source=(source) @@ -521,10 +508,8 @@ class Puppet::Util::Log # We can't just check for whether it responds to :path, because # plenty of providers respond to that in their normal function. if (source.is_a?(Puppet::Type) or source.is_a?(Puppet::Parameter)) and source.respond_to?(:path) - @objectsource = true @source = source.path else - @objectsource = false @source = source.to_s end if source.respond_to?(:tags) |