lumber 0.11.1 → 0.12.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.12.0 (05/31/2012)
+-------------------
+
+allow setting of outputter levels too <c0fc515>
+
 0.11.1 (05/23/2012)
 -------------------
 

data/lib/lumber/level_util.rb

@@ -51,9 +51,14 @@ module Lumber
       else
         backup_levels(levels.keys)
         levels.each do |name, level|
-          logger = Lumber.find_or_create_logger(name)
           level_val = Log4r::LNAMES.index(level)
-          logger.level = level_val if level_val
+          outputter = Log4r::Outputter[name]
+          if outputter
+            outputter.level = level_val if level_val && outputter.level != level_val
+          else
+            logger = Lumber.find_or_create_logger(name)
+            logger.level = level_val if level_val && logger.level != level_val
+          end
         end
       end
     end
@@ -81,6 +86,7 @@ module Lumber
     protected
     
     @original_levels = {}
+    @original_outputter_levels = {}
     
     # Backs up original values of logger levels before we overwrite them
     # This is better in local memory since we shouldn't reset loggers that we haven't set
@@ -88,9 +94,14 @@ module Lumber
     def backup_levels(loggers)
       synchronize do
         loggers.each do |name|
-          logger = Lumber.find_or_create_logger(name)
-          # only store the old level if we haven't overriden it's logger yet
-          @original_levels[name] ||= logger.level
+          outputter = Log4r::Outputter[name]
+          if outputter
+            @original_outputter_levels[name] ||= outputter.level
+          else
+            logger = Lumber.find_or_create_logger(name)
+            # only store the old level if we haven't overriden it's logger yet
+            @original_levels[name] ||= logger.level
+          end
         end
       end
     end
@@ -98,9 +109,15 @@ module Lumber
     # Restores original values of logger levels after expiration
     def restore_levels
       synchronize do
+        @original_outputter_levels.each do |name, level|
+          outputter = Log4r::Outputter[name]
+          outputter.level = level if outputter.level != level
+        end
+        @original_outputter_levels.clear
+        
         @original_levels.each do |name, level|
           logger = Lumber.find_or_create_logger(name)
-          logger.level = level
+          logger.level = level if logger.level != level
         end
         @original_levels.clear
       end

data/lib/lumber/server/views/levels.erb

@@ -38,9 +38,13 @@
 </table>
 
 <script type="text/javascript" charset="utf-8">
-
-  var typeahead_logger_names = <%=  lnames = []; Log4r::Logger.each {|name, logger| lnames << name }; lnames.inspect %>;
-  var typeahead_logger_levels = <%= Log4r::LNAMES.inspect %>;
+  <%
+    lnames = []
+    Log4r::Outputter.each {|name, outputter| lnames << name }
+    Log4r::Logger.each {|name, logger| lnames << name }
+  %> 
+  var typeahead_logger_names = <%= lnames.sort.inspect %>;
+  var typeahead_logger_levels = <%= Log4r::LNAMES.sort.inspect %>;
   
   jQuery(document).ready(function() {
     $('input[name="levels[][name]"]').typeahead({source: typeahead_logger_names})

data/lib/lumber/version.rb

@@ -1,3 +1,3 @@
 module Lumber
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

data/spec/level_util_spec.rb

@@ -45,7 +45,7 @@ describe Lumber::LevelUtil do
     Log4r::Logger[@name].should == foo_logger
   end
   
-  it "activate level on logger" do
+  it "activates level on logger" do
     Lumber.find_or_create_logger(@name)
     LevelUtil.set_levels({@name => "ERROR"})
     Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
@@ -53,6 +53,20 @@ describe Lumber::LevelUtil do
     Log4r::Logger[@name].level.should == Log4r::LNAMES.index("ERROR")
   end
   
+  it "activates level on outputter" do
+    logger = Lumber.find_or_create_logger(@name)
+    sio = StringIO.new 
+    outputter = Log4r::IOOutputter.new("sbout", sio)
+    logger.outputters = [outputter]
+        
+    LevelUtil.set_levels({"sbout" => "ERROR"})
+    Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
+    outputter.level.should == Log4r::LNAMES.index("DEBUG")
+    LevelUtil.activate_levels
+    Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
+    outputter.level.should == Log4r::LNAMES.index("ERROR")
+  end
+  
   it "restores levels when mapping expires" do
     Lumber.find_or_create_logger(@name)
     Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
@@ -66,6 +80,42 @@ describe Lumber::LevelUtil do
     Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
   end
   
+  it "restores levels on outputter when mapping expires" do
+    logger = Lumber.find_or_create_logger(@name)
+    sio = StringIO.new 
+    outputter = Log4r::IOOutputter.new("sbout", sio)
+    logger.outputters = [outputter]
+
+    outputter.level.should == Log4r::LNAMES.index("DEBUG")
+
+    LevelUtil.set_levels({"sbout" => "ERROR"})
+    LevelUtil.activate_levels
+    outputter.level.should == Log4r::LNAMES.index("ERROR")
+
+    LevelUtil.set_levels({})
+    LevelUtil.activate_levels
+    outputter.level.should == Log4r::LNAMES.index("DEBUG")
+  end
+  
+  it "doesn't set levels if already set" do
+    logger = Lumber.find_or_create_logger(@name)
+    sio = StringIO.new 
+    outputter = Log4r::IOOutputter.new("sbout", sio)
+    logger.outputters = [outputter]
+
+    outputter.level.should == Log4r::LNAMES.index("DEBUG")
+    Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
+    
+    outputter.should_not_receive(:level=)
+    Log4r::Logger[@name].should_not_receive(:level=)
+    
+    LevelUtil.set_levels({"sbout" => "DEBUG", @name => "DEBUG"})
+    LevelUtil.activate_levels
+    
+    LevelUtil.set_levels({})
+    LevelUtil.activate_levels
+  end
+  
   it "starts a monitor thread" do
     LevelUtil.set_levels({@name => "DEBUG"})
     LevelUtil.activate_levels

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumber
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r