lib/flail/exception.rb in flail-0.0.1 vs lib/flail/exception.rb in flail-0.0.2

@@ -9,11 +9,15 @@
 
     #
     # Helpers
     #
     def request
-      @request ||= ActionDispatch::Request.new(@env)
+      @request ||= if @env['flail.request']
+                     @env['flail.request']
+                   else
+                     ActionDispatch::Request.new(@env)
+                   end
     end
 
     def controller
       @controller ||= @env['action_controller.instance']
     end
@@ -35,30 +39,34 @@
     def handle!
       Flail.swing(self.extract.to_json) unless self.ignore?
     end
 
     def extract
-      @extract ||= {}.tap do |info|
-        info[:class_name]  = @exception.class.to_s        # @exception class
-        info[:message]     = @exception.to_s              # error message
-        info[:trace]       = @exception.backtrace.to_json # backtrace of error
-        info[:target_url]  = request.url                  # url of request
-        info[:referer_url] = request.referer              # referer
-        info[:params]      = request.params.to_json       # request parameters
-        info[:user_agent]  = request.user_agent           # user agent
-        info[:user]        = self.user.to_json            # current user
+      @extract ||= begin
+                     info = {}
 
-        # special variables
-        info[:environment] = Flail.configuration.env
-        info[:hostname]    = Flail.configuration.hostname
-        info[:api_key]    = Flail.configuration.api_key
-      end
+                     info[:class_name]  = @exception.class.to_s        # @exception class
+                     info[:message]     = @exception.to_s              # error message
+                     info[:trace]       = @exception.backtrace.to_json # backtrace of error
+                     info[:target_url]  = request.url                  # url of request
+                     info[:referer_url] = request.referer              # referer
+                     info[:parameters]  = request.params.to_json       # request parameters
+                     info[:user_agent]  = request.user_agent           # user agent
+                     info[:user]        = self.user.to_json            # current user
+
+                     # special variables
+                     info[:environment] = Flail.configuration.env
+                     info[:hostname]    = Flail.configuration.hostname
+                     info[:tag]    = Flail.configuration.tag
+
+                     info
+                   end
     end
 
     def ignore?
       # Ignore requests with user agent string matching
       # this regxp as they are surely made by bots
-      if @request.user_agent =~ /\b(Baidu|Gigabot|Googlebot|libwww-perl|lwp-trivial|msnbot|SiteUptime|Slurp|WordPress|ZIBB|ZyBorg|Yandex|Jyxobot|Huaweisymantecspider|ApptusBot)\b/i
+      if request.user_agent =~ /\b(Baidu|Gigabot|Googlebot|libwww-perl|lwp-trivial|msnbot|SiteUptime|Slurp|WordPress|ZIBB|ZyBorg|Yandex|Jyxobot|Huaweisymantecspider|ApptusBot)\b/i
         return true
       end
 
       false
     end