diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-12-28 17:38:57 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-12-30 11:43:47 -0800 |
| commit | e596a570b2734ea27eec57a6e3a11843ccb47614 (patch) | |
| tree | bd1d1c39ea116e86b7ea1fd00591c46627d6947d /lib/puppet | |
| parent | 908e0e09ed94ab6b74aba3b9e4fa95318d8894ef (diff) | |
| download | puppet-e596a570b2734ea27eec57a6e3a11843ccb47614.tar.gz puppet-e596a570b2734ea27eec57a6e3a11843ccb47614.tar.xz puppet-e596a570b2734ea27eec57a6e3a11843ccb47614.zip | |
(#5715) Removed Puppet::Util::Log#version.
This attribute was only relevant in reports, and in reports it was
redundant with Puppet::Transaction::Report#configuration_version and
Puppet::Transaction::Report#puppet_version.
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/log.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/util/log_paths.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/logging.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb index 7764dc1d1..3fdac3f69 100644 --- a/lib/puppet/util/log.rb +++ b/lib/puppet/util/log.rb @@ -189,7 +189,7 @@ class Puppet::Util::Log @levels.include?(level) end - attr_accessor :time, :remote, :file, :line, :version, :source + attr_accessor :time, :remote, :file, :line, :source attr_reader :level, :message def initialize(args) @@ -203,7 +203,7 @@ class Puppet::Util::Log tags.each { |t| self.tag(t) } end - [:file, :line, :version].each do |attr| + [:file, :line].each do |attr| next unless value = args[attr] send(attr.to_s + "=", value) end @@ -234,7 +234,7 @@ class Puppet::Util::Log descriptors[:tags].each { |t| tag(t) } - [:file, :line, :version].each do |param| + [:file, :line].each do |param| next unless descriptors[param] send(param.to_s + "=", descriptors[param]) end diff --git a/lib/puppet/util/log_paths.rb b/lib/puppet/util/log_paths.rb index f59197ed1..2fefd4505 100644 --- a/lib/puppet/util/log_paths.rb +++ b/lib/puppet/util/log_paths.rb @@ -15,7 +15,7 @@ module Puppet::Util::LogPaths descriptors[:tags] = tags - [:path, :file, :line, :version].each do |param| + [:path, :file, :line].each do |param| next unless value = send(param) descriptors[param] = value end diff --git a/lib/puppet/util/logging.rb b/lib/puppet/util/logging.rb index f20444a3b..bc52b17f0 100644 --- a/lib/puppet/util/logging.rb +++ b/lib/puppet/util/logging.rb @@ -26,7 +26,7 @@ module Puppet::Util::Logging end def log_metadata - [:file, :line, :version, :tags].inject({}) do |result, attr| + [:file, :line, :tags].inject({}) do |result, attr| result[attr] = send(attr) if respond_to?(attr) result end |
