gray_logger 0.9.3 → 0.9.4

data/lib/gray_logger.rb

@@ -8,6 +8,7 @@ require 'gray_logger/middleware'
 require 'gray_logger/helper_methods'
 
 
-if defined?(Rails) && Rails.version.to_i >= 3
-  require 'gray_logger/railtie'
+if defined?(Rails)
+  require 'gray_logger/rails_modules'
+  require 'gray_logger/railtie' if defined?(Rails::Railtie)
 end

data/lib/gray_logger/middleware.rb

@@ -22,11 +22,18 @@ module GrayLogger
         message_store = env["rack.gray_logger.message_store"] = GrayLogger::MessageStore.new(:level => GELF::INFO)
         status, headers, body = @app.call(env)
       rescue => e
-        message_store.oder_exception_backtrace = e.backtrace.to_s
-        raise e
+        message_store.short_message = "Error: #{e.inspect}"
+        message_store.exception_backtrace = e.backtrace.join("\n")
+        raise
       ensure
+        error = env['rack.exception']
+        if error
+          message_store.short_message = "Error: #{error.inspect}"
+          message_store.exception_backtrace = error.backtrace.join("\n")
+        end
         message_store.status_code = status.to_i
         gray_logger.notify!(message_store.to_message) unless gray_logger.nil?
+        [status, headers, body]
       end
 
     end

data/lib/gray_logger/rails_modules.rb

@@ -0,0 +1,24 @@
+module GrayLogger
+  module RailsModules
+    module ActionControllerCatcher
+
+      # Sets up an alias chain to catch exceptions when Rails does
+      def self.included(base) #:nodoc:
+        base.send(:alias_method, :rescue_action_without_gray_logger, :rescue_action)
+        base.send(:alias_method, :rescue_action, :rescue_action_with_gray_logger)
+      end
+
+      private
+
+      # Overrides the rescue_action method in ActionController::Base, but does not inhibit
+      # any custom processing that is defined with Rails 2's exception helpers.
+      def rescue_action_with_gray_logger(exception)
+        gray_logger.exception_backtrace = exception.backtrace.join("\n")
+        gray_logger.short_message = "Error: #{exception.inspect}"
+        rescue_action_without_gray_logger(exception)
+      end
+    end
+  end  
+end
+
+ActionController::Base.send(:include, GrayLogger::RailsModules::ActionControllerCatcher)

data/lib/gray_logger/railtie.rb

@@ -5,7 +5,7 @@ module GrayLogger
     begin
       initializer "gray_logger.configure_rails_initialization" do |app|
         configuration = YAML.load(File.read(Rails.root.join('config/gray_logger.yml')))[Rails.env]
-        app.middleware.insert_after "Rack::Lock", "GrayLogger::Middleware", :configuration => configuration
+        app.middleware.insert_after "ActionDispatch::ShowExceptions", "GrayLogger::Middleware", :configuration => configuration
       end
     rescue => e
       $stderr.puts("GrayLogger not configured. Please add config/gray_logger.yml")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gray_logger
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Benjamin Behr
@@ -44,6 +44,7 @@ files:
 - lib/gray_logger/message.rb
 - lib/gray_logger/message_store.rb
 - lib/gray_logger/middleware.rb
+- lib/gray_logger/rails_modules.rb
 - lib/gray_logger/railtie.rb
 - lib/gray_logger/support.rb
 - lib/gray_logger.rb