log4r-exceptionable 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.5.2 (06/15/2012)
+------------------
+
+Put exception trace in message rather than context <9bc73b7>
+
 0.5.1 (06/15/2012)
 ------------------
 

data/lib/log4r-exceptionable/rack_failure_handler.rb

@@ -40,10 +40,14 @@ module Log4rExceptionable
         original_mdc = mdc.get_context
         
         begin
+          message = "#{exception.class}: #{exception.message}"
+          
           mdc.put('rack_exception', exception.class.name)
           trace = Array(exception.backtrace)
           if trace.size > 0
-            mdc.put('rack_exception_backtrace', trace.join("\n"))
+            message << "\n"
+            message << trace.join("\n")
+
             file, line = trace[0].split(":")
             mdc.put('rack_exception_file', file)
             mdc.put('rack_exception_line', line)
@@ -67,7 +71,6 @@ module Log4rExceptionable
             error_logger = Log4rExceptionable::Configuration.rack_failure_logger
           end
           
-          message = "#{exception.class}: #{exception.message}"
           error_logger.error(message)
         ensure
           # Since this is somewhat of a global map, clean the keys

data/lib/log4r-exceptionable/resque_failure_handler.rb

@@ -12,10 +12,14 @@ module Log4rExceptionable
         original_mdc = mdc.get_context
         
         begin
-          mdc.put('rack_exception', exception.class.name)
+          message = "#{exception.class}: #{exception.message}"
+          
+          mdc.put('resque_exception', exception.class.name)
           trace = Array(exception.backtrace)
           if trace.size > 0
-            mdc.put('resque_exception_backtrace', trace.join("\n"))
+            message << "\n"
+            message << trace.join("\n")
+            
             file, line = trace[0].split(":")
             mdc.put('resque_exception_file', file)
             mdc.put('resque_exception_line', line)
@@ -33,7 +37,6 @@ module Log4rExceptionable
             error_logger = Log4rExceptionable::Configuration.resque_failure_logger
           end
           
-          message = "#{exception.class}: #{exception.message}"
           error_logger.error(message)
         ensure
           # Since this is somewhat of a global map, clean the keys

data/lib/log4r-exceptionable/version.rb

@@ -1,3 +1,3 @@
 module Log4rExceptionable
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/configuration_spec.rb

@@ -4,6 +4,11 @@ describe Log4rExceptionable::Configuration do
 
   context "configure" do
 
+    before(:each) do
+      Log4rExceptionable::Configuration.rack_failure_logger = nil
+      Log4rExceptionable::Configuration.resque_failure_logger = nil
+    end
+    
     it "should raise if no logger in config" do
       lambda {
         Log4rExceptionable::Configuration.configure do |config|
@@ -11,14 +16,15 @@ describe Log4rExceptionable::Configuration do
       }.should raise_error("log4r-exceptionable requires a rack_failure_logger or resque_failure_logger")
     end
 
-    it "should not raise if config valid" do
+    it "should not raise if config has a rack logger" do
       lambda {
         Log4rExceptionable::Configuration.configure do |config|
           config.rack_failure_logger = 'mylogger'
         end
       }.should_not raise_exception
-      Log4rExceptionable::Configuration.rack_failure_logger = nil
-      
+    end
+    
+    it "should not raise if config has a resque logger" do
       lambda {
         Log4rExceptionable::Configuration.configure do |config|
           config.resque_failure_logger = 'mylogger'

data/spec/rack_failure_handler_spec.rb

@@ -65,9 +65,8 @@ describe Log4rExceptionable::RackFailureHandler do
     
     it "triggers failure handler" do
       Log4r::Logger['racklogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
-        Log4r::MDC.get('rack_exception_backtrace').should =~ /rack_failure_handler_spec.rb/
-        Log4r::MDC.get('rack_exception_backtrace').lines.to_a.size.should > 1
+        msg.should =~ /^RuntimeError: I failed/
+        msg.should =~ /rack_failure_handler_spec.rb/
         Log4r::MDC.get('rack_exception_line').should =~ /\d+/
         Log4r::MDC.get('rack_exception_file').should =~ /rack_failure_handler_spec.rb/
         Log4r::MDC.get('rack_env_PATH_INFO').should == '"/error"'
@@ -81,7 +80,7 @@ describe Log4rExceptionable::RackFailureHandler do
     it "uses default logger if controller logger is nil" do
       
       Log4r::Logger['racklogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
       end
       
       lambda {
@@ -92,7 +91,7 @@ describe Log4rExceptionable::RackFailureHandler do
     it "uses default logger if controller logger is not log4r" do
       
       Log4r::Logger['racklogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
       end
       
       lambda {
@@ -104,7 +103,7 @@ describe Log4rExceptionable::RackFailureHandler do
       Log4r::Logger.new('ControllerLogger')
       Log4r::Logger['racklogger'].should_not_receive(:error)
       Log4r::Logger['ControllerLogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
       end
       
       lambda {
@@ -115,7 +114,7 @@ describe Log4rExceptionable::RackFailureHandler do
     it "uses default logger if rack logger is nil" do
       
       Log4r::Logger['racklogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
       end
       
       lambda {
@@ -126,7 +125,7 @@ describe Log4rExceptionable::RackFailureHandler do
     it "uses default logger if rack logger is not log4r" do
       
       Log4r::Logger['racklogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
       end
       
       lambda {
@@ -138,7 +137,7 @@ describe Log4rExceptionable::RackFailureHandler do
       Log4r::Logger.new('RackLogger')
       Log4r::Logger['racklogger'].should_not_receive(:error)
       Log4r::Logger['RackLogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
       end
       
       lambda {

data/spec/resque_failure_handler_spec.rb

@@ -52,9 +52,8 @@ describe Log4rExceptionable::ResqueFailureHandler do
     it "triggers failure handler" do
       
       Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
-        Log4r::MDC.get('resque_exception_backtrace').should =~ /resque_failure_handler_spec.rb/
-        Log4r::MDC.get('resque_exception_backtrace').lines.to_a.size.should > 1
+        msg.should =~ /^RuntimeError: I failed/
+        msg.should =~ /resque_failure_handler_spec.rb/
         Log4r::MDC.get('resque_exception_line').should =~ /\d+/
         Log4r::MDC.get('resque_exception_file').should =~ /resque_failure_handler_spec.rb/
         Log4r::MDC.get('resque_worker').should == ""
@@ -69,7 +68,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
     it "uses default logger if job logger is nil" do
       
       Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
         Log4r::MDC.get('resque_class').should == "SomeJobWithNilLogger"
       end
       
@@ -79,7 +78,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
     it "uses default logger if job logger is not log4r" do
       
       Log4r::Logger['resquelogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
         Log4r::MDC.get('resque_class').should == "SomeJobWithOtherLogger"
       end
       
@@ -90,7 +89,7 @@ describe Log4rExceptionable::ResqueFailureHandler do
       Log4r::Logger.new('SomeJobWithLogger')
       Log4r::Logger['resquelogger'].should_not_receive(:error)
       Log4r::Logger['SomeJobWithLogger'].should_receive(:error) do |msg|
-        msg.should == "RuntimeError: I failed"
+        msg.should =~ /^RuntimeError: I failed/
         Log4r::MDC.get('resque_class').should == "SomeJobWithLogger"
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log4r-exceptionable
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors: