From 07f186d5a858412c0608c368806825e1e44efd4c Mon Sep 17 00:00:00 2001
From: Rein Henrichs <rein@puppetlabs.com>
Date: Mon, 23 Aug 2010 16:28:27 -0700
Subject: [#4552] Updating --timing to report in milliseconds instead of
 seconds

---
 lib/facter.rb                 |  7 +------
 lib/facter/util/resolution.rb | 10 ++++------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/facter.rb b/lib/facter.rb
index 661831f..f48138a 100644
--- a/lib/facter.rb
+++ b/lib/facter.rb
@@ -80,12 +80,7 @@ module Facter
 
     # show the timing information
     def self.show_time(string)
-        if string.nil?
-            return
-        end
-        if self.timing?
-            puts GREEN + string + RESET
-        end
+        puts "#{GREEN}#{string}#{RESET}" if string and Facter.timing?
     end
 
     def self.timing?
diff --git a/lib/facter/util/resolution.rb b/lib/facter/util/resolution.rb
index 875b654..4a99c35 100644
--- a/lib/facter/util/resolution.rb
+++ b/lib/facter/util/resolution.rb
@@ -136,7 +136,7 @@ class Facter::Util::Resolution
         result = nil
         return result if @code == nil and @interpreter == nil
 
-        starttime = Time.now.to_i
+        starttime = Time.now.to_f
 
         begin
             Timeout.timeout(limit) do
@@ -159,11 +159,9 @@ 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
+        finishtime = Time.now.to_f
+        ms = (finishtime - starttime) * 1000
+        Facter.show_time "#{self.name}: #{"%.2f" % ms}ms"
 
         return nil if result == ""
         return result
-- 
cgit