lib/flail/exception.rb in flail-0.0.6 vs lib/flail/exception.rb in flail-0.0.7

@@ -28,11 +28,32 @@
                             :user => {},
                           }
                         end
     end
 
+    def clean_unserializable_data(data, stack = [])
+      return "[possible infinite recursion halted]" if stack.any? {|item| item == data.object_id}
 
+      if data.respond_to?(:to_hash)
+        data.to_hash.inject({}) do |result, (key, value)|
+          result.merge(key => clean_unserializable_data(value, stack + [data.object_id]))
+        end
+      elsif data.respond_to?(:to_ary)
+        data.to_ary.collect do |value|
+          clean_unserializable_data(value, stack + [data.object_id])
+        end
+      else
+        data.to_s
+      end
+    end
+
+    def clean_rack_env(data)
+      data.delete("rack.request.form_vars")
+      data
+    end
+
+
     #
     # Handling the exception
     #
     def handle!
       Flail.swing(self.extract.to_json) unless self.ignore?
@@ -41,19 +62,24 @@
     def extract
       @extract ||= begin
                      info = {}
 
                      # rack env
-                     info[:rack]        = @env.except('flail.request', 'flail.request.data', 'rack.errors', 'rack.input')
+                     info[:rack]        = clean_rack_env(clean_unserializable_data(@env))
+
                      info[:class_name]  = @exception.class.to_s             # @exception class
                      info[:message]     = @exception.to_s                   # error message
                      info[:trace]       = @exception.backtrace              # backtrace of error
                      info[:target_url]  = request_data[:target_url]         # url of request
                      info[:referer_url] = request_data[:referer_url]        # referer
-                     info[:parameters]  = request_data[:parameters]         # request parameters
                      info[:user_agent]  = request_data[:user_agent]         # user agent
                      info[:user]        = request_data[:user]               # current user
-                     info[:session_data]= request_data[:session_data]       # session
+
+                     # request parameters
+                     info[:parameters]  = clean_unserializable_data(request_data[:parameters])
+
+                     # session
+                     info[:session_data]= clean_unserializable_data(request_data[:session_data])
 
                      # special variables
                      info[:environment] = Flail.configuration.env
                      info[:hostname]    = Flail.configuration.hostname
                      info[:tag]    = Flail.configuration.tag