diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-08-23 16:13:21 -0700 |
|---|---|---|
| committer | Rein Henrichs <rein@puppetlabs.com> | 2010-10-04 14:26:10 -0700 |
| commit | 1f387a5970d942fc297da791b1422adc80fc474a (patch) | |
| tree | 178eff59bbde7e711455bc364eb9c2b3e5132aff /lib/facter/util | |
| parent | 244d2f13d0c911081d1e99365a1770f2022b839f (diff) | |
| download | facter-1f387a5970d942fc297da791b1422adc80fc474a.tar.gz facter-1f387a5970d942fc297da791b1422adc80fc474a.tar.xz facter-1f387a5970d942fc297da791b1422adc80fc474a.zip | |
[#4552] Apply patch from Dean Wilson
Diffstat (limited to 'lib/facter/util')
| -rw-r--r-- | lib/facter/util/resolution.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/facter/util/resolution.rb b/lib/facter/util/resolution.rb index f837f64..875b654 100644 --- a/lib/facter/util/resolution.rb +++ b/lib/facter/util/resolution.rb @@ -135,6 +135,9 @@ class Facter::Util::Resolution def value result = nil return result if @code == nil and @interpreter == nil + + starttime = Time.now.to_i + begin Timeout.timeout(limit) do if @code.is_a?(Proc) @@ -156,6 +159,12 @@ class Facter::Util::Resolution return nil end + finishtime = Time.now.to_i + + if Facter.timing? + Facter.show_time "Executing #{self.name} took #{finishtime - starttime} seconds" + end + return nil if result == "" return result end |