Removed the option to send Errbit's errors elsewhere. All internal Errbit errors…

… are now stored in an automatically created app called 'Self.Errbit'.

Removed the option to send Errbit's errors elsewhere. All internal Errbit errors…
… are now stored in an automatically created app called 'Self.Errbit'.
Nathan Broadbent
1 parent 5e7f599f
Showing 4 changed files with 18 additions and 41 deletions Show diff stats
config/config.example.yml
config/initializers/_load_config.rb
config/initializers/hoptoad.rb
lib/overrides/hoptoad_notifier/hoptoad_notifier.rb
@@ -44,14 +44,3 @@ user_has_username: false
 #  :user_name:            USERNAME
 #  :password:             PASSWORD
-
-# Configure tracking for Errbit's own internal errors.
-# By default, Errbit will log it's own errors to an internal App named 'Self.Errbit'.
-# The 'Self.Errbit' app will be automatically created whenever the first error happens.
-# Uncomment this section if you would rather send error reports to our central Errbit instance.
-# ---------------------------------------------------------------------------------------------
-#report_self_errors:  true
-#self_errors_host:    errbit-central.heroku.com
-#self_errors_port:    80
-#self_errors_api_key: 11e5ce322856e540481e6a0789893179
-
@@ -9,11 +9,6 @@ if ENV[&#39;HEROKU&#39;]
   Errbit::Config.email_at_notices = [1,3,10] #ENV['ERRBIT_EMAIL_AT_NOTICES']
   Errbit::Config.confirm_resolve_err = ENV['ERRBIT_CONFIRM_RESOLVE_ERR']
-  Errbit::Config.report_self_errors = ENV['ERRBIT_REPORT_SELF_ERRORS']
-  Errbit::Config.self_errors_host = ENV['ERRBIT_SELF_ERRORS_HOST']
-  Errbit::Config.self_errors_port = ENV['ERRBIT_SELF_ERRORS_PORT']
-  Errbit::Config.self_errors_api_key = ENV['ERRBIT_SELF_ERRORS_API_KEY']
-
   Errbit::Config.smtp_settings = {
     :address        => "smtp.sendgrid.net",
     :port           => "25",
 HoptoadNotifier.configure do |config|
-  config.api_key = Errbit::Config.self_errors_api_key || "11e5ce322856e540481e6a0789893179"
-  config.host    = Errbit::Config.self_errors_host    || "errbit-central.heroku.com"
-  config.port    = Errbit::Config.self_errors_port    || 80
-  config.secure  = config.port == 443
+  # Internal Errbit errors are stored locally, but we need
+  # to set a dummy API key so that HoptoadNotifier doesn't complain.
+  config.api_key = "---------"
 end
@@ -5,31 +5,25 @@
 HoptoadNotifier.module_eval do
   class << self
     private
-      def send_notice_with_internal(notice)
-        if Errbit::Config.report_self_errors.to_s == "true"
-          # Using the original method, send notice to a different Errbit instance.
-          send_notice_without_internal(notice)
-        else
-          # Otherwise, if we are not in a development environment, log the error internally.
-          if configuration.public?
-            begin
-              app = App.find_or_initialize_by(:name => "Self.Errbit")
-              if app.new?
-                app.github_url = "https://github.com/errbit/errbit.git"
-                app.save!
-              end
-              notice.send("api_key=", app.api_key)
-              # Create notice internally.
-              # 'to_xml ~> from_xml' provides a data bridge between hoptoad_notifier and Errbit.
-              ::Notice.from_xml(notice.to_xml)
-              logger.info "Internal error was logged to 'Self.Errbit' app."
-            rescue
-              logger.error "-- Errbit crashed while processing an internal error!" if logger
+      def send_notice(notice)
+        # Log the error internally if we are not in a development environment.
+        if configuration.public?
+          begin
+            app = App.find_or_initialize_by(:name => "Self.Errbit")
+            if app.new?
+              app.github_url = "https://github.com/errbit/errbit.git"
+              app.save!
             end
+            notice.send("api_key=", app.api_key)
+            # Create notice internally.
+            # 'to_xml ~> from_xml' provides a data bridge between hoptoad_notifier and Errbit.
+            ::Notice.from_xml(notice.to_xml)
+            logger.info "Internal error was logged to 'Self.Errbit' app."
+          rescue
+            logger.error "-- Errbit crashed while processing an internal error!" if logger
           end
         end
       end
-      alias_method_chain :send_notice, :internal
   end
 end
	@@ -44,14 +44,3 @@ user_has_username: false		@@ -44,14 +44,3 @@ user_has_username: false
44	# :user_name: USERNAME	44	# :user_name: USERNAME
45	# :password: PASSWORD	45	# :password: PASSWORD
46		46
47	-
48	-# Configure tracking for Errbit's own internal errors.
49	-# By default, Errbit will log it's own errors to an internal App named 'Self.Errbit'.
50	-# The 'Self.Errbit' app will be automatically created whenever the first error happens.
51	-# Uncomment this section if you would rather send error reports to our central Errbit instance.
52	-# ---------------------------------------------------------------------------------------------
53	-#report_self_errors: true
54	-#self_errors_host: errbit-central.heroku.com
55	-#self_errors_port: 80
56	-#self_errors_api_key: 11e5ce322856e540481e6a0789893179
57	-