metric testing and graphing now works in the library, although nothing has been done in the language

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

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/puppet/log.rb b/lib/puppet/log.rb
index 9cfb80193..5f77e623c 100644
--- a/lib/puppet/log.rb
+++ b/lib/puppet/log.rb
@@ -47,12 +47,14 @@ module Puppet
         def Log.create(level,*ary)
             msg = ary.join(" ")
 
-            if @@levels.index(@@loglevel) >= @@levels.index(level)
-                Puppet::Log.new(
+            if @@levels.index(level) >= @@loglevel 
+                return Puppet::Log.new(
                     :level => level,
                     :source => "Puppet",
                     :message => msg
                 )
+            else
+                return nil
             end
         end
 
@@ -86,11 +88,11 @@ module Puppet
                 level = level.intern
             end
 
-            unless @@loglevels.include?(level)
+            unless @@levels.include?(level)
                 raise "Invalid loglevel %s" % level
             end
 
-            @@loglevel = @@loglevels.index(level)
+            @@loglevel = @@levels.index(level)
         end
 
         def Log.newmessage(msg)