summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-04-05 16:23:11 +1000
committerJames Turnbull <james@lovedthanlost.net>2010-04-05 16:23:11 +1000
commitf0e12e521742ade60f8901cd1e5317b2d3d81cc3 (patch)
treef8fd1161f58f00de57dfd72f5731315c76a02116
parent0eea2f5d67efc6eebe89c4a97043150dbee0dcc6 (diff)
downloadpuppet-f0e12e521742ade60f8901cd1e5317b2d3d81cc3.tar.gz
puppet-f0e12e521742ade60f8901cd1e5317b2d3d81cc3.tar.xz
puppet-f0e12e521742ade60f8901cd1e5317b2d3d81cc3.zip
Fix #3496 - suppress transaction debug message
Fix via Brice Figureau
-rw-r--r--lib/puppet/transaction.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb
index 53b1c51f7..028bdb8c8 100644
--- a/lib/puppet/transaction.rb
+++ b/lib/puppet/transaction.rb
@@ -215,7 +215,7 @@ class Transaction
# Collect the targets of any subscriptions to those events. We pass
# the parent resource in so it will override the source in the events,
# since eval_generated children can't have direct relationships.
- Puppet::Util.benchmark(:debug, "Time for triggering #{events.size} events to edges") do
+ duration = thinmark do
b = relationship_graph.matching_edges(events, resource)
b.each do |orig_edge|
# We have to dup the label here, else we modify the original edge label,
@@ -226,6 +226,8 @@ class Transaction
set_trigger(edge)
end
end
+ Puppet.debug("Time for triggering #{events.size} events to edges: #{duration}") if events.size > 0 and duration > 0
+
# And return the events for collection
events
end