diff options
Diffstat (limited to 'lib/puppet/util/logging.rb')
-rw-r--r-- | lib/puppet/util/logging.rb | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/lib/puppet/util/logging.rb b/lib/puppet/util/logging.rb index b4a531bfc..f20444a3b 100644 --- a/lib/puppet/util/logging.rb +++ b/lib/puppet/util/logging.rb @@ -3,38 +3,38 @@ require 'puppet/util/log' module Puppet::Util::Logging - def send_log(level, message) - Puppet::Util::Log.create({:level => level, :source => log_source, :message => message}.merge(log_metadata)) + def send_log(level, message) + Puppet::Util::Log.create({:level => level, :source => log_source, :message => message}.merge(log_metadata)) + end + + # Create a method for each log level. + Puppet::Util::Log.eachlevel do |level| + define_method(level) do |args| + args = args.join(" ") if args.is_a?(Array) + send_log(level, args) end + end - # Create a method for each log level. - Puppet::Util::Log.eachlevel do |level| - define_method(level) do |args| - args = args.join(" ") if args.is_a?(Array) - send_log(level, args) - end - end + private - private + def is_resource? + defined?(Puppet::Type) && is_a?(Puppet::Type) + end - def is_resource? - defined?(Puppet::Type) && is_a?(Puppet::Type) - end + def is_resource_parameter? + defined?(Puppet::Parameter) && is_a?(Puppet::Parameter) + end - def is_resource_parameter? - defined?(Puppet::Parameter) && is_a?(Puppet::Parameter) + def log_metadata + [:file, :line, :version, :tags].inject({}) do |result, attr| + result[attr] = send(attr) if respond_to?(attr) + result end + end - def log_metadata - [:file, :line, :version, :tags].inject({}) do |result, attr| - result[attr] = send(attr) if respond_to?(attr) - result - end - end - - def log_source - # We need to guard the existence of the constants, since this module is used by the base Puppet module. - (is_resource? or is_resource_parameter?) and respond_to?(:path) and return path.to_s - to_s - end + def log_source + # We need to guard the existence of the constants, since this module is used by the base Puppet module. + (is_resource? or is_resource_parameter?) and respond_to?(:path) and return path.to_s + to_s + end end |