errplane 0.1.8 → 0.1.9

data/lib/errplane.rb

@@ -35,11 +35,12 @@ module Errplane
 
     def transmit_unless_ignorable(e, env)
       begin
-        black_box = assemble_black_box_for(e)
-        ::Rails.logger.info("\nTransmitter: #{transmitter.inspect}")
-        ::Rails.logger.info("\nBlack Box: #{black_box.to_json}")
-        ::Rails.logger.info("\nIgnorable Exception? #{ignorable_exception?(e)}")
-        ::Rails.logger.info("\nEnvironment: #{ENV.to_hash}")
+        black_box = assemble_black_box_for(e, env)
+        configuration.logger.info("\nTransmitter: #{transmitter.inspect}") if configuration.debug?
+        configuration.logger.info("\nBlack Box: #{black_box.to_json}") if configuration.debug?
+        configuration.logger.info("\nIgnorable Exception? #{ignorable_exception?(e)}") if configuration.debug?
+        configuration.logger.info("\nEnvironment: #{ENV.to_hash}") if configuration.debug?
+
         transmitter.relay(black_box) unless ignorable_exception?(e)
       rescue
         configuration.logger.info("[Errplane] Something went terribly wrong. Exception failed to take off.")
@@ -54,10 +55,10 @@ module Errplane
           assemble_black_box_for(e)
         end
 
-        ::Rails.logger.info("\nTransmitter: #{transmitter.inspect}")
-        ::Rails.logger.info("\nBlack Box: #{black_box.to_json}")
-        ::Rails.logger.info("\nIgnorable Exception? #{ignorable_exception?(e)}")
-        ::Rails.logger.info("\nEnvironment: #{ENV.to_hash}")
+        configuration.logger.info("\nTransmitter: #{transmitter.inspect}") if configuration.debug?
+        configuration.logger.info("\nBlack Box: #{black_box.to_json}") if configuration.debug?
+        configuration.logger.info("\nIgnorable Exception? #{ignorable_exception?(e)}") if configuration.debug?
+        configuration.logger.info("\nEnvironment: #{ENV.to_hash}") if configuration.debug?
         transmitter.relay(black_box)
       rescue
         configuration.logger.info("[Errplane] Something went terribly wrong. Exception failed to take off.")
@@ -69,19 +70,12 @@ module Errplane
     end
 
     private
-    def assemble_black_box_for(e, options = {})
-      exception = unwrap_exception(e)
-      black_box = BlackBox.new(:exception => exception)
-    end
-
-    def unwrap_exception(e)
-      if e.respond_to?(:original_exception)
-        e.original_exception
-      elsif e.respond_to?(:continued_exception)
-        e.continued_exception
-      else
-        e
-      end
+    def assemble_black_box_for(e, opts = {})
+      configuration.logger.info("OPTS: #{opts}")
+      e = e.continued_exception if e.respond_to?(:continued_exception)
+      e = e.original_exception if e.respond_to?(:original_exception)
+      opts = opts.merge(:exception => e)
+      black_box = BlackBox.new(opts)
     end
   end
 end

data/lib/errplane/black_box.rb

@@ -1,25 +1,55 @@
 module Errplane
   class BlackBox
     attr_reader :exception
+    attr_reader :params
+    attr_reader :session_data
+    attr_reader :controller
+    attr_reader :action
+    attr_reader :request_url
 
     def initialize(params = {})
       @exception = params[:exception]
+      @params = params[:params] || {}
+      @session_data = params[:session_data] || {}
+      @controller = params[:controller]
+      @action = params[:action]
+      @request_url = params[:request_url]
     end
 
     def to_json
       {
         :time => Time.now.to_i,
-        :message => @exception.message,
-        :backtrace => @exception.backtrace || [],
-        :exception_class => @exception.class.to_s,
         :application_name => Errplane.configuration.application_name,
-        :rails_root => Errplane.configuration.rails_root,
-        :language => Errplane.configuration.language,
-        :language_version => Errplane.configuration.language_version,
+        :application_root => Errplane.configuration.application_root,
         :framework => Errplane.configuration.framework,
         :framework_version => Errplane.configuration.framework_version,
-        :environment_variables => Errplane.configuration.environment_variables.to_hash,
+        :message => @exception.message,
+        :backtrace => @exception.backtrace || [],
+        :exception_class => @exception.class.to_s,
+        :language => "Ruby",
+        :language_version => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
+        :environment_variables => ENV.to_hash,
+        :reporter => reporter,
+        :request_data => request_data
       }.to_json
     end
+
+    def reporter
+      {
+        :name => "Errplane",
+        :version => Errplane::VERSION,
+        :url => "http://github.com/errplane/gem"
+      }
+    end
+
+    def request_data
+      {
+        :params => @params,
+        :session_data => @session_data,
+        :controller => @controller,
+        :action => @action,
+        :request_url => @request_url
+      }
+    end
   end
 end

data/lib/errplane/configuration.rb

@@ -4,10 +4,10 @@ module Errplane
     attr_accessor :api_host
     attr_accessor :application_id
     attr_accessor :application_name
+    attr_accessor :application_root
 
     attr_accessor :logger
     attr_accessor :rails_environment
-    attr_accessor :rails_root
     attr_accessor :framework
     attr_accessor :framework_version
     attr_accessor :language
@@ -16,6 +16,8 @@ module Errplane
     attr_accessor :ignored_environments
     attr_accessor :environment_variables
 
+    attr_accessor :debug
+
     DEFAULTS = {
       :api_host => "api.errplane.com",
       :ignored_exceptions => %w{ActiveRecord::RecordNotFound
@@ -27,6 +29,11 @@ module Errplane
       @api_host = DEFAULTS[:api_host]
       @ignored_exceptions = DEFAULTS[:ignored_exceptions].dup
       @ignored_environments = DEFAULTS[:ignored_environments].dup
+      @debug = false
+    end
+
+    def debug?
+      !!@debug
     end
 
     def ignore_current_environment?

data/lib/errplane/rails/air_traffic_controller.rb

@@ -0,0 +1,26 @@
+module Errplane
+  module Rails
+    module AirTrafficController
+      def errplane_request_data
+        {
+          :params => params.to_hash,
+          :session_data => errplane_session_data,
+          :controller => params[:controller],
+          :action => params[:action],
+          :request_url => errplane_request_url
+        }
+      end
+
+      private
+      def errplane_session_data
+        session.respond_to?(:to_hash) ? session.to_hash : session.data
+      end
+
+      def errplane_request_url
+        url = "#{request.protocol}#{request.host}"
+        url << ":#{request.port}" unless [80, 443].include?(request.port)
+        url << request.fullpath
+      end
+    end
+  end
+end

data/lib/errplane/rails/middleware/hijack_render_exception.rb

@@ -7,8 +7,10 @@ module Errplane
         end
 
         def render_exception_with_errplane(env, e)
-          controller = env['action_controller.instance']
-          Errplane.transmit_unless_ignorable(e, env)
+          controller = env["action_controller.instance"]
+          Errplane.configuration.logger.info("Controller: #{controller}")
+          Errplane.configuration.logger.info("Request Data: #{controller.try(:errplane_request_data)}")
+          Errplane.transmit_unless_ignorable(e, controller.try(:errplane_request_data))
           render_exception_without_errplane(env, e)
         end
       end

data/lib/errplane/railtie.rb

@@ -37,9 +37,26 @@ module Errplane
 
           puts "Generating sample request.."
           env = ::Rack::MockRequest.env_for("/errplane_test")
-          ::Rails.application.call(env)
 
-          puts "Done. Check your email or http://errplane.com for the exception notice."
+          puts "Attempting to raise exception via HTTP.."
+          response = ::Rails.application.call(env)
+
+          if response.try(:first) == 500
+            puts "Done. Check your email or http://errplane.com for the exception notice."
+          else
+            puts "Request failed: #{response}"
+
+            env["HTTPS"] = "on"
+            puts "Attempting to raise exception via HTTPS.."
+            response = ::Rails.application.call(env)
+
+            if response.try(:first) == 500
+              puts "Done. Check your email or http://errplane.com for the exception notice."
+            else
+              puts "Request failed: #{response}"
+              puts "We didn't get the exception we were expecting. Contact support@errplane.com and send them all of this output."
+            end
+          end
         end
       end
     end
@@ -52,13 +69,15 @@ module Errplane
       Errplane.configure(true) do |config|
         config.logger                ||= ::Rails.logger
         config.rails_environment     ||= ::Rails.env
-        config.rails_root            ||= ::Rails.root
+        config.application_root      ||= ::Rails.root
         config.application_name      ||= ::Rails.application.class.parent_name
         config.framework               = "Rails"
         config.framework_version       = ::Rails::VERSION::STRING
-        config.language                = "Ruby"
-        config.language_version        = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
-        config.environment_variables   = ENV.to_hash
+      end
+
+      ActiveSupport.on_load(:action_controller) do
+        require 'errplane/rails/air_traffic_controller'
+        include Errplane::Rails::AirTrafficController
       end
 
       if defined?(::ActionDispatch::DebugExceptions)

data/lib/errplane/sinatra.rb

@@ -1,12 +1,9 @@
 Errplane.configure(true) do |config|
   config.logger                ||= logger
   config.rails_environment     ||= settings.environment
-  config.rails_root            ||= settings.root
+  config.application_root            ||= settings.root
   config.framework               = "Sinatra"
   config.framework_version       = ::Sinatra::VERSION
-  config.language                = "Ruby"
-  config.language_version        = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
-  config.environment_variables   = ENV.to_hash
 end
 
 error do

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides exception reporting with Errplane for Rails 3.x applications.
 email:
@@ -31,6 +31,7 @@ files:
 - lib/errplane/configuration.rb
 - lib/errplane/deployment.rb
 - lib/errplane/rack.rb
+- lib/errplane/rails/air_traffic_controller.rb
 - lib/errplane/rails/middleware/hijack_render_exception.rb
 - lib/errplane/railtie.rb
 - lib/errplane/sinatra.rb