summaryrefslogtreecommitdiffstats
path: root/lib/puppet/transaction/report.rb
diff options
context:
space:
mode:
authorPaul Berry <paul@puppetlabs.com>2010-12-29 15:33:14 -0800
committerPaul Berry <paul@puppetlabs.com>2010-12-30 11:53:16 -0800
commit716ee1cd76a2b30c10e715bca3e22896d9c4e36f (patch)
treee7ea2e94a99dd842abad74c417e9c104bc986dfa /lib/puppet/transaction/report.rb
parent037eac4383ed5a5e9cdde765b607a180209bad1e (diff)
downloadpuppet-716ee1cd76a2b30c10e715bca3e22896d9c4e36f.tar.gz
puppet-716ee1cd76a2b30c10e715bca3e22896d9c4e36f.tar.xz
puppet-716ee1cd76a2b30c10e715bca3e22896d9c4e36f.zip
(#5715) Changed the type of metric names to always be strings.
Diffstat (limited to 'lib/puppet/transaction/report.rb')
-rw-r--r--lib/puppet/transaction/report.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/puppet/transaction/report.rb b/lib/puppet/transaction/report.rb
index 6315973ba..8e04759ad 100644
--- a/lib/puppet/transaction/report.rb
+++ b/lib/puppet/transaction/report.rb
@@ -44,7 +44,7 @@ class Puppet::Transaction::Report
end
def compute_status(resource_metrics, change_metric)
- if (resource_metrics[:failed] || 0) > 0
+ if (resource_metrics["failed"] || 0) > 0
'failed'
elsif change_metric > 0
'changed'
@@ -57,7 +57,7 @@ class Puppet::Transaction::Report
resource_metrics = add_metric(:resources, calculate_resource_metrics)
add_metric(:time, calculate_time_metrics)
change_metric = calculate_change_metric
- add_metric(:changes, {:total => change_metric})
+ add_metric(:changes, {"total" => change_metric})
add_metric(:events, calculate_event_metrics)
@status = compute_status(resource_metrics, change_metric)
end
@@ -109,8 +109,8 @@ class Puppet::Transaction::Report
# individual bits represent the presence of different metrics.
def exit_status
status = 0
- status |= 2 if @metrics["changes"][:total] > 0
- status |= 4 if @metrics["resources"][:failed] > 0
+ status |= 2 if @metrics["changes"]["total"] > 0
+ status |= 4 if @metrics["resources"]["failed"] > 0
status
end
@@ -126,9 +126,9 @@ class Puppet::Transaction::Report
def calculate_event_metrics
metrics = Hash.new(0)
- metrics[:total] = 0
+ metrics["total"] = 0
resource_statuses.each do |name, status|
- metrics[:total] += status.events.length
+ metrics["total"] += status.events.length
status.events.each do |event|
metrics[event.status] += 1
end
@@ -139,12 +139,12 @@ class Puppet::Transaction::Report
def calculate_resource_metrics
metrics = Hash.new(0)
- metrics[:total] = resource_statuses.length
+ metrics["total"] = resource_statuses.length
resource_statuses.each do |name, status|
Puppet::Resource::Status::STATES.each do |state|
- metrics[state] += 1 if status.send(state)
+ metrics[state.to_s] += 1 if status.send(state)
end
end