log4r-exceptionable 0.6.0 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.7.0 (06/21/2012)
+------------------
+
+allow logging exceptions with custom log level, default to fatal <3db1839>
+
 0.6.0 (06/18/2012)
 ------------------
 

data/README.md

@@ -33,6 +33,11 @@ Add to some initializer code:
       #
       # config.use_source_logger = false
       
+      # Log at the given log level
+      # optional - defaults to :fatal
+      #
+      # config.log_level = :error
+      
       # A whitelist of the context keys to include when logging.
       # If this is set, _only_these keys will show up.
       # optional - defaults to nil, so all keys get included

data/lib/log4r-exceptionable/configuration.rb

@@ -9,6 +9,8 @@ module Log4rExceptionable
       attr_accessor :rack_failure_logger, :resque_failure_logger
       # Allows one to force use of default loggers by setting to false
       attr_accessor :use_source_logger
+      # The level to log exceptions
+      attr_accessor :log_level
       # whitelist of context keys (e.g. keys in rack env) to include in log4r context when logging
       attr_accessor :context_inclusions
       # blacklist of context keys (e.g. keys in rack env) to exclude in log4r context when logging
@@ -17,6 +19,7 @@ module Log4rExceptionable
 
     # default values
     self.use_source_logger = true
+    self.log_level = :fatal
 
     def self.configure
       yield self
@@ -35,7 +38,9 @@ module Log4rExceptionable
       
       self.context_inclusions = Set.new(self.context_inclusions) if self.context_inclusions
       self.context_exclusions = Set.new(self.context_exclusions) if self.context_exclusions
-      
+
+      raise "Invalid log level: #{self.log_level}" unless Log4r::LNAMES.include?(self.log_level.to_s.upcase)
+      self.log_level = self.log_level.to_sym
     end
 
     def self.set_logger(accessor)

data/lib/log4r-exceptionable/rack_failure_handler.rb

@@ -71,7 +71,7 @@ module Log4rExceptionable
         
         error_logger ||= Log4rExceptionable::Configuration.rack_failure_logger
         
-        error_logger.error(exception)
+        error_logger.send(Log4rExceptionable::Configuration.log_level, exception)
         
       end
       

data/lib/log4r-exceptionable/resque_failure_handler.rb

@@ -36,7 +36,7 @@ module Log4rExceptionable
         
         error_logger ||= Log4rExceptionable::Configuration.resque_failure_logger
         
-        error_logger.error(exception)
+        error_logger.send(Log4rExceptionable::Configuration.log_level, exception)
       end
       
     end

data/lib/log4r-exceptionable/version.rb

@@ -1,3 +1,3 @@
 module Log4rExceptionable
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/configuration_spec.rb

@@ -60,6 +60,31 @@ describe Log4rExceptionable::Configuration do
       Log4rExceptionable::Configuration.rack_failure_logger.should == Log4r::Logger['otherlogger']
     end
     
+    it "should raise if invalid log_level" do
+      lambda {
+        Log4rExceptionable::Configuration.configure do |config|
+          config.rack_failure_logger = "mylogger"
+          config.log_level = nil
+        end
+      }.should raise_error("Invalid log level: ")
+
+      lambda {
+        Log4rExceptionable::Configuration.configure do |config|
+          config.rack_failure_logger = "mylogger"
+          config.log_level = :foobar
+        end
+      }.should raise_error("Invalid log level: foobar")
+    end
+
+    it "should allow setting valid log_level" do
+      lambda {
+        Log4rExceptionable::Configuration.configure do |config|
+          config.rack_failure_logger = "mylogger"
+          config.log_level = :debug
+        end
+      }.should_not raise_error
+    end
+
   end
   
 end

data/spec/rack_failure_handler_spec.rb

@@ -64,16 +64,17 @@ describe Log4rExceptionable::RackFailureHandler do
         config.use_source_logger = true
         config.context_inclusions = nil
         config.context_exclusions = nil
+        config.log_level = :fatal
       end
     end
     
     it "doesn't log a failure with normal usage" do
-      Log4r::Logger['racklogger'].should_not_receive(:error)
+      Log4r::Logger['racklogger'].should_not_receive(:fatal)
       get "/"
     end
     
     it "triggers failure handler" do
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         msg.backtrace.first.should =~ /rack_failure_handler_spec.rb/
@@ -87,7 +88,7 @@ describe Log4rExceptionable::RackFailureHandler do
     
     it "uses default logger if controller logger is nil" do
       
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
       end
@@ -99,7 +100,7 @@ describe Log4rExceptionable::RackFailureHandler do
     
     it "uses default logger if controller logger is not log4r" do
       
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
       end
@@ -111,8 +112,8 @@ describe Log4rExceptionable::RackFailureHandler do
     
     it "uses controller logger if set" do
       Log4r::Logger.new('ControllerLogger')
-      Log4r::Logger['racklogger'].should_not_receive(:error)
-      Log4r::Logger['ControllerLogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_not_receive(:fatal)
+      Log4r::Logger['ControllerLogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
       end
@@ -125,8 +126,8 @@ describe Log4rExceptionable::RackFailureHandler do
     it "uses default logger if source logger disabled" do
       Log4rExceptionable::Configuration.use_source_logger = false
       Log4r::Logger.new('ControllerLogger')
-      Log4r::Logger['ControllerLogger'].should_not_receive(:error)
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['ControllerLogger'].should_not_receive(:fatal)
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
       end
@@ -138,7 +139,7 @@ describe Log4rExceptionable::RackFailureHandler do
     
     it "adds controller names if set" do
       Log4r::Logger.new('ControllerLogger')
-      Log4r::Logger['ControllerLogger'].should_receive(:error) do |msg|
+      Log4r::Logger['ControllerLogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get('rack_controller_name').should == 'foo'
@@ -152,7 +153,7 @@ describe Log4rExceptionable::RackFailureHandler do
     
     it "uses default logger if rack logger is nil" do
       
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
       end
@@ -163,7 +164,7 @@ describe Log4rExceptionable::RackFailureHandler do
     end
     
     it "uses default logger if rack logger is not log4r" do
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
       end
@@ -175,8 +176,8 @@ describe Log4rExceptionable::RackFailureHandler do
     
     it "uses rack logger if set" do
       Log4r::Logger.new('RackLogger')
-      Log4r::Logger['racklogger'].should_not_receive(:error)
-      Log4r::Logger['RackLogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_not_receive(:fatal)
+      Log4r::Logger['RackLogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
       end
@@ -189,7 +190,7 @@ describe Log4rExceptionable::RackFailureHandler do
     it "only includes inclusions if set" do
       Log4rExceptionable::Configuration.context_inclusions = ['rack_env_rack.version']
       
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get_context.keys.should == ['rack_env_rack.version']
@@ -204,7 +205,7 @@ describe Log4rExceptionable::RackFailureHandler do
     it "excludes exclusions if set" do
       Log4rExceptionable::Configuration.context_exclusions = ['rack_env_rack.version']
       
-      Log4r::Logger['racklogger'].should_receive(:error) do |msg|
+      Log4r::Logger['racklogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get_context.keys.should_not include 'rack_env_rack.version'
@@ -216,6 +217,19 @@ describe Log4rExceptionable::RackFailureHandler do
       
     end
 
+    it "logs with given log_level" do
+      Log4rExceptionable::Configuration.log_level = :info
+      
+      Log4r::Logger['racklogger'].should_receive(:info) do |msg|
+        msg.should be_instance_of RuntimeError
+        msg.message.should == "I failed"
+      end
+      
+      lambda {
+        get "/other_rack_logger"
+      }.should raise_error("I failed")
+    end
+    
   end
   
 end

data/spec/resque_failure_handler_spec.rb

@@ -47,6 +47,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
         config.use_source_logger = true
         config.context_inclusions = nil
         config.context_exclusions = nil
+        config.log_level = :fatal
       end
       
       Resque::Failure.backend = Log4rExceptionable::ResqueFailureHandler
@@ -54,7 +55,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
     
     it "triggers failure handler" do
       
-      Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
+      Log4r::Logger['resquelogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         msg.backtrace.first.should =~ /resque_failure_handler_spec.rb/
@@ -69,7 +70,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
     
     it "uses default logger if job logger is nil" do
       
-      Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
+      Log4r::Logger['resquelogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get('resque_class').should == SomeJobWithNilLogger
@@ -80,7 +81,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
     
     it "uses default logger if job logger is not log4r" do
       
-      Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
+      Log4r::Logger['resquelogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get('resque_class').should == SomeJobWithOtherLogger
@@ -91,8 +92,8 @@ describe Log4rExceptionable::ResqueFailureHandler do
     
     it "uses job logger if set" do
       Log4r::Logger.new('SomeJobWithLogger')
-      Log4r::Logger['resquelogger'].should_not_receive(:error)
-      Log4r::Logger['SomeJobWithLogger'].should_receive(:error) do |msg|
+      Log4r::Logger['resquelogger'].should_not_receive(:fatal)
+      Log4r::Logger['SomeJobWithLogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get('resque_class').should == SomeJobWithLogger
@@ -105,8 +106,8 @@ describe Log4rExceptionable::ResqueFailureHandler do
       Log4rExceptionable::Configuration.use_source_logger = false
       
       Log4r::Logger.new('SomeJobWithLogger')
-      Log4r::Logger['SomeJobWithLogger'].should_not_receive(:error)
-      Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
+      Log4r::Logger['SomeJobWithLogger'].should_not_receive(:fatal)
+      Log4r::Logger['resquelogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get('resque_class').should == SomeJobWithLogger
@@ -118,7 +119,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
     it "only includes inclusions if set" do
       Log4rExceptionable::Configuration.context_inclusions = ['resque_queue']
       
-      Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
+      Log4r::Logger['resquelogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get_context.keys.should == ['resque_queue']
@@ -130,7 +131,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
     it "excludes exclusions if set" do
       Log4rExceptionable::Configuration.context_exclusions = ['resque_queue']
       
-      Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
+      Log4r::Logger['resquelogger'].should_receive(:fatal) do |msg|
         msg.should be_instance_of RuntimeError
         msg.message.should == "I failed"
         Log4r::MDC.get_context.keys.should_not include 'resque_queue'
@@ -139,6 +140,18 @@ describe Log4rExceptionable::ResqueFailureHandler do
       run_resque_job(SomeJob, 'foo', :queue => :somequeue, :inline => true)
     end
     
+    it "logs with given log_level" do
+      Log4rExceptionable::Configuration.log_level = :info
+      
+      Log4r::Logger['resquelogger'].should_receive(:info) do |msg|
+        msg.should be_instance_of RuntimeError
+        msg.message.should == "I failed"
+      end
+      
+      run_resque_job(SomeJob, 'foo', :queue => :somequeue, :inline => true)
+    end
+    
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log4r-exceptionable
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake