bugsnag 1.0.3 → 1.0.4

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/bugsnag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bugsnag"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2012-01-15"
+  s.date = "2012-01-16"
   s.description = "Ruby notifier for bugsnag.com"
   s.email = "james@bugsnag.com"
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/bugsnag/rails/action_controller_rescue.rb",
     "lib/bugsnag/rails/controller_methods.rb",
     "lib/bugsnag/railtie.rb",
+    "lib/bugsnag/resque.rb",
     "lib/bugsnag/version.rb",
     "rails/init.rb",
     "test/helper.rb",

data/lib/bugsnag.rb

@@ -12,20 +12,44 @@ module Bugsnag
   LOG_PREFIX = "** [Bugsnag] "
 
   class << self
+    # Configure the gem to send notifications, at the very least an api_key is required
     def configure
-      yield(configuration)      
-      log "Bugsnag exception handler #{VERSION} ready, api_key=#{configuration.api_key}" if configuration.api_key
+      yield(configuration)
+
+      # Use resque for asynchronous notification if required
+      require "bugsnag/resque" if configuration.use_resque && defined?(Resque)
+
+      # Log that we are ready to rock
+      if configuration.api_key && !@logged_ready
+        log "Bugsnag exception handler #{VERSION} ready, api_key=#{configuration.api_key}" 
+        @logged_ready = true
+      end
     end
 
+    # Explicitly notify of an exception
     def notify(exception, session_data={})
+      Notification.new(exception, configuration.merge(session_data)).deliver
+    end
+
+    # Notify of an exception unless it should be ignored
+    def notify_or_ignore(exception, session_data={})
       notification = Notification.new(exception, configuration.merge(session_data))
       notification.deliver unless notification.ignore?
     end
 
+    # Auto notify of an exception, called from rails and rack exception 
+    # rescuers, unless auto notification is disabled, or we should ignore this
+    # error class
+    def auto_notify(exception, session_data={})
+      notify_or_ignore(exception, session_data) unless configuration.disable_auto_notification
+    end
+
+    # Log wrapper
     def log(message)
       configuration.logger.info(LOG_PREFIX + message) if configuration.logger
     end
 
+    # Configuration getter
     def configuration
       @configuration ||= Bugsnag::Configuration.new
     end

data/lib/bugsnag/configuration.rb

@@ -3,7 +3,8 @@ module Bugsnag
     OPTIONS = [
       :api_key, :release_stage, :project_root, :app_version,
       :framework, :endpoint, :logger, :disable_auto_notification,
-      :params_filters, :stacktrace_filters, :ignore_classes
+      :params_filters, :stacktrace_filters, :ignore_classes,
+      :use_resque
     ]
     OPTIONS.each {|o| attr_accessor o }
 

data/lib/bugsnag/notification.rb

@@ -23,6 +23,15 @@ module Bugsnag
                   :ignore_classes, :endpoint, :app_version, :release_stage, 
                   :project_root
 
+
+    def self.deliver_exception_payload(endpoint, payload_string)
+      begin
+        response = post(endpoint, {:body => payload_string})
+      rescue Exception => e
+        Bugsnag.log("Notification to #{self.endpoint} failed, #{e.inspect}")
+      end
+    end
+
     def initialize(exception, opts={})
       self.exception = exception
       opts.reject! {|k,v| v.nil?}.each do |k,v|
@@ -46,13 +55,7 @@ module Bugsnag
         }.reject {|k,v| v.nil? }]
       }
 
-      begin
-        response = self.class.post(self.endpoint, {:body => MultiJson.encode(payload)})
-      rescue Exception => e
-        Bugsnag.log("Notification to #{self.endpoint} failed, #{e.inspect}")
-      end
-      
-      return response
+      self.class.deliver_exception_payload(self.endpoint, MultiJson.encode(payload))
     end
 
     def ignore?
@@ -74,8 +77,8 @@ module Bugsnag
     end
 
     def stacktrace_hash
-      return [] unless self.exception.backtrace
-      self.exception.backtrace.map do |trace|
+      stacktrace = self.exception.backtrace || caller
+      stacktrace.map do |trace|
         method = nil
         file, line_str, method_str = trace.split(":")
 

data/lib/bugsnag/rack.rb

@@ -8,12 +8,12 @@ module Bugsnag
       begin
         response = @app.call(env)
       rescue Exception => raised
-        error_id = Bugsnag.notify(raised, bugsnag_request_data(env))
+        Bugsnag.auto_notify(raised, bugsnag_request_data(env))
         raise
       end
 
       if env['rack.exception']
-        error_id = Bugsnag.notify(env['rack.exception'], bugsnag_request_data(env))
+        Bugsnag.auto_notify(env['rack.exception'], bugsnag_request_data(env))
       end
 
       response

data/lib/bugsnag/rails/action_controller_rescue.rb

@@ -11,18 +11,16 @@ module Bugsnag
 
       private
       def rescue_action_in_public_with_bugsnag(exception)
-        auto_notify(exception) unless Bugsnag.configuration.disable_auto_notification
+        # bugsnag_request_data is defined in controller_methods.rb
+        Bugsnag.auto_notify(exception, bugsnag_request_data)
         rescue_action_in_public_without_bugsnag(exception)
       end
       
       def rescue_action_locally_with_bugsnag(exception)
-        auto_notify(exception) unless Bugsnag.configuration.disable_auto_notification
+        # bugsnag_request_data is defined in controller_methods.rb
+        Bugsnag.auto_notify(exception, bugsnag_request_data)
         rescue_action_locally_without_bugsnag(exception)
       end
-      
-      def auto_notify(exception)
-        notify_bugsnag(exception)
-      end
     end
   end
 end

data/lib/bugsnag/rails/controller_methods.rb

@@ -3,11 +3,9 @@ module Bugsnag
     module ControllerMethods
       private
       def notify_bugsnag(exception, custom_data=nil)
-        unless bugsnag_local_request?
-          request_data = bugsnag_request_data
-          request_data[:meta_data][:custom] = custom_data if custom_data
-          Bugsnag.notify(exception, request_data)
-        end
+        request_data = bugsnag_request_data
+        request_data[:meta_data][:custom] = custom_data if custom_data
+        Bugsnag.notify(exception, request_data)
       end
 
       def bugsnag_request_data
@@ -19,22 +17,14 @@ module Bugsnag
               :url => bugsnag_request_url,
               :controller => params[:controller],
               :action => params[:action],
-              :params => bugsnag_filter_if_filtering(params.to_hash),
+              :params => bugsnag_filter_if_filtering(Bugsnag::Helpers.cleanup_hash(params.to_hash)),
             },
-            :session => bugsnag_filter_if_filtering(bugsnag_session_data),
+            :session => bugsnag_filter_if_filtering(Bugsnag::Helpers.cleanup_hash(bugsnag_session_data)),
             :environment => bugsnag_filter_if_filtering(Bugsnag::Helpers.cleanup_hash(request.env))
           }
         }
       end
 
-      def bugsnag_local_request?
-        if defined?(::Rails.application.config)
-          ::Rails.application.config.consider_all_requests_local || request.local?
-        else
-          consider_all_requests_local || local_request?
-        end
-      end
-
       def bugsnag_session_id
         session = bugsnag_session_data
         session[:session_id] || session["session_id"]

data/lib/bugsnag/resque.rb

@@ -0,0 +1,19 @@
+module Bugsnag
+  class Resque
+    @queue = "bugsnag"
+    def self.perform(*args)
+      Bugsnag::Notification.deliver_exception_payload_without_resque(*args)
+    end
+  end
+end
+
+Bugsnag::Notification.class_eval do
+  class << self
+    def deliver_exception_payload_with_resque(*args)
+      Resque.enqueue(Bugsnag::Resque, *args)
+    end
+  
+    alias_method :deliver_exception_payload_without_resque, :deliver_exception_payload
+    alias_method :deliver_exception_payload, :deliver_exception_payload_with_resque
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -132,6 +132,7 @@ files:
 - lib/bugsnag/rails/action_controller_rescue.rb
 - lib/bugsnag/rails/controller_methods.rb
 - lib/bugsnag/railtie.rb
+- lib/bugsnag/resque.rb
 - lib/bugsnag/version.rb
 - rails/init.rb
 - test/helper.rb