summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelen Campbell <helen@puppetlabs.com>2016-09-06 15:00:07 +0100
committerHelen Campbell <helen@puppetlabs.com>2016-09-06 15:15:29 +0100
commitb63862ff43194194f7428739a32cfe13bad1e7ed (patch)
tree718e8f1e6cf3ed846af73a81bf8b6d3226e59842
parentb2d05e9b3f5da65ad3dc39b95b342e9085e52346 (diff)
Addition of logging with file and line numbers
-rw-r--r--lib/puppet/functions/deprecation.rb8
-rw-r--r--lib/puppet/functions/validate_legacy.rb4
-rw-r--r--lib/puppet/parser/functions/deprecation.rb4
3 files changed, 11 insertions, 5 deletions
diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 6b7b977..30aeb1d 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -1,5 +1,4 @@
# Function to print deprecation warnings, Logs a warning once for a given key. The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method It is affected by the puppet setting 'strict', which can be set to :error (outputs as an error message), :off (no message / error is displayed) and :warning (default, outputs a warning) *Type*: String, String.
-#
Puppet::Functions.create_function(:deprecation) do
dispatch :deprecation do
@@ -9,13 +8,16 @@ Puppet::Functions.create_function(:deprecation) do
def deprecation(key, message)
# depending on configuration setting of strict
+ caller_infos = caller.first.split(":")
case Puppet.settings[:strict]
when :off
# do nothing
when :error
- fail("deprecation. #{key}. #{message}")
+ err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+ fail("deprecation. #{key}. #{err_message}")
else
- Puppet.deprecation_warning(message, key)
+ err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+ Puppet.deprecation_warning(err_message, key)
end
end
end
diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index 9d7d012..b1066e2 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -28,8 +28,10 @@ Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalF
Puppet.warn("Accepting previously invalid value for target_type '#{target_type}'")
end
else
+ caller_infos = caller.first.split(":")
inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value)
- error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch(previous_validation, target_type, inferred_type)
+ message = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch(previous_validation, target_type, inferred_type)
+ error_msg = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
if previous_validation(previous_validation, value, *prev_args)
Puppet.warn(error_msg)
else
diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index e30f3a0..0cb247d 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -11,7 +11,9 @@ EOS
message = arguments[1]
if ENV['STDLIB_LOG_DEPRECATIONS'] == "true"
- warning("deprecation. #{key}. #{message}")
+ caller_infos = caller.first.split(":")
+ err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
+ warning("deprecation. #{key}. #{err_message}")
end
end
end