Tweak some details

Author: fractaledmind

Gemfile.lock

@@ -88,8 +88,6 @@ GEM
       net-smtp
     mini_mime (1.1.5)
     minitest (5.25.1)
-    mocha (2.4.5)
-      ruby2_keywords (>= 0.0.5)
     net-imap (0.4.14)
       date
       net-protocol
@@ -159,7 +157,6 @@ GEM
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     securerandom (0.3.1)
     sqlite3 (2.0.4-arm64-darwin)
     sqlite3 (2.0.4-x86_64-linux-gnu)
@@ -192,7 +189,6 @@ PLATFORMS
 
 DEPENDENCIES
   minitest (~> 5.0)
-  mocha
   rake (~> 13.0)
   solid_errors!
   sqlite3

app/models/solid_errors/cleaner.rb

@@ -2,8 +2,8 @@ module SolidErrors
   class Occurrence < Record
     belongs_to :error, class_name: "SolidErrors::Error"
 
-    after_create_commit :send_email, if: -> { SolidErrors.send_emails? && SolidErrors.email_to.present? }
-    after_create_commit -> { SolidErrors::Cleaner.go! }
+    after_create_commit :send_email, if: -> { SolidErrors.send_emails && SolidErrors.email_to.present? }
+    after_create_commit :clear_resolved_errors, if: :should_clear_resolved_errors?
 
     # The parsed exception backtrace. Lines in this backtrace that are from installed gems
     # have the base path for gem installs replaced by "[GEM_ROOT]", while those in the project
@@ -24,5 +24,26 @@ def parse_backtrace(backtrace)
     def send_email
       ErrorMailer.error_occurred(self).deliver_later
     end
+
+    def clear_resolved_errors
+      transaction do
+        SolidErrors::Occurrence
+          .where(error: SolidErrors::Error.resolved)
+          .where(created_at: ...SolidErrors.destroy_after.ago)
+          .delete_all
+        SolidErrors::Error.resolved
+          .where
+          .missing(:occurrences)
+          .delete_all
+      end
+    end
+
+    def should_clear_resolved_errors?
+      return false unless SolidErrors.destroy_after
+      return false unless SolidErrors.destroy_after.respond_to?(:ago)
+      return false unless (id % 100).zero?
+
+      true
+    end
   end
 end

app/models/solid_errors/occurrence.rb

@@ -39,7 +39,7 @@ def report(error, handled:, severity:, context:, source: nil)
 
       SolidErrors::Occurrence.create(
         error_id: record.id,
-        backtrace: error.backtrace.join("\n"),
+        backtrace: error.backtrace&.join("\n"),
         context: s(context)
       )
     end

lib/solid_errors/subscriber.rb

@@ -30,5 +30,4 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "mocha"
 end

solid_errors.gemspec

@@ -1,56 +1,49 @@
 require "test_helper"
 
-class SolidErrors::CleanerTest < ActiveSupport::TestCase
-  setup do
-    assert_nil SolidErrors.destroy_after
+class SolidErrors::OccurrenceTest < ActiveSupport::TestCase
+  def teardown
+    SolidErrors.destroy_after = nil
   end
 
-  test "not destroy if destroy_after is not set" do
+  test "do not destroy if destroy_after is not set" do
+    SolidErrors.destroy_after = nil
     simulate_99_old_exceptions(:resolved)
 
     assert_difference -> { SolidErrors::Error.count }, +1 do
       assert_difference -> { SolidErrors::Occurrence.count }, +1 do
-        Rails.error.report(dummy_exception)
+        Rails.error.report(StandardError.new("oof"))
       end
     end
   end
 
   test "destroy old occurrences every 100 insertions if destroy_after is set" do
-    set_destroy_after
+    SolidErrors.destroy_after = 1.day
     simulate_99_old_exceptions(:resolved)
-    Rails.error.report(dummy_exception)
 
-    assert_equal 1, SolidErrors::Error.count
-    assert_equal 1, SolidErrors::Occurrence.count
+    assert_difference -> { SolidErrors::Error.count }, 0 do
+      assert_difference -> { SolidErrors::Occurrence.count }, 0 do
+        Rails.error.report(StandardError.new("oof"))
+      end
+    end
   end
 
   test "not destroy if errors are unresolved" do
-    set_destroy_after
+    SolidErrors.destroy_after = 1.day
     simulate_99_old_exceptions(:unresolved)
 
     assert_difference -> { SolidErrors::Error.count }, +1 do
       assert_difference -> { SolidErrors::Occurrence.count }, +1 do
         assert_empty SolidErrors::Error.resolved
-        Rails.error.report(dummy_exception)
+        Rails.error.report(StandardError.new("oof"))
       end
     end
   end
 
   private
 
   def simulate_99_old_exceptions(status)
-    Rails.error.report(dummy_exception("argh"))
+    Rails.error.report(StandardError.new("argh"))
     SolidErrors::Error.update_all(resolved_at: Time.current) if status == :resolved
     SolidErrors::Occurrence.last.update!(id: 99, created_at: 1.day.ago)
   end
-
-  def set_destroy_after
-    SolidErrors.stubs(destroy_after: 1.day)
-  end
-
-  def dummy_exception(message = "oof")
-    exception = StandardError.new(message)
-    exception.set_backtrace(caller)
-    exception
-  end
 end

test/models/solid_errors/cleaner_test.rb …t/models/solid_errors/occurrence_test.rbtest/models/solid_errors/cleaner_test.rb renamed to test/models/solid_errors/occurrence_test.rb test/models/solid_errors/cleaner_test.rb renamed to test/models/solid_errors/occurrence_test.rb

@@ -8,5 +8,3 @@
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../test/dummy/db/migrate", __dir__)]
 require "rails/test_help"
 require "solid_errors"
-
-require "mocha/minitest"