fixing metrics tests to work with everything else

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@316 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 1 insertions, 6 deletions

diff --git a/lib/puppet/metric.rb b/lib/puppet/metric.rb
index d9696b601..d66105bdf 100644
--- a/lib/puppet/metric.rb
+++ b/lib/puppet/metric.rb
@@ -18,9 +18,7 @@ module Puppet
         end
 
         def Metric.clear
-            @@metrics = {}
-            @@eventmetrics = nil
-            @@typemetrics = nil
+            Metric.init
         end
 
         def Metric.gather
@@ -226,7 +224,6 @@ module Puppet
                 RRD.graph(*args)
             rescue => detail
                 Puppet.err "Failed to graph %s: %s" % [self.name,detail]
-                exit
             end
         end
 
@@ -241,12 +238,10 @@ module Puppet
                 args.push value[2]
             }
             arg = args.join(":")
-            Puppet.debug "Updating %s with %s" % [self.name,arg]
             begin
                 RRD.update(self.path,args.join(":"))
             rescue => detail
                 Puppet.err "Failed to update %s: %s" % [self.name,detail]
-                exit
             end
         end
     end