Merge branch 'main' into deps

discourse · Nov 15, 2023 · bb2b1c3 · bb2b1c3
2 parents 71ed2d6 + aefffe0
commit bb2b1c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/mini_scheduler/manager.rb b/lib/mini_scheduler/manager.rb
@@ -274,7 +274,7 @@ def reschedule_orphans_on!(hostname = nil)
         info = schedule_info(klass)
 
         if ['QUEUED', 'RUNNING'].include?(info.prev_result) &&
-          (info.current_owner.blank? || !redis.get(info.current_owner))
+          (!info.current_owner || !redis.get(info.current_owner))
           info.prev_result = 'ORPHAN'
           info.next_run = Time.now.to_i
           info.write!

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'mini_scheduler'
+require 'active_support'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/integer/time'
 require 'mocha/api'