crono_trigger 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50a79e41f2762ce69d2667b8f9af205a30764986f8f7dab39c6ad26539e35e5d
-  data.tar.gz: 8d10f131f42691ee9e8b4f0479f8959d9ac7f8b3ff3b5e33b03d10c5933d49a0
+  metadata.gz: e08f955458cc12b3cd3f3aab84e0f662d760c7a72872c655708e70aa4d4d0ac3
+  data.tar.gz: de4c5fdd13008080291d3adf542e05a9fb5e233f423a8d83ea8bc0bc70a09cde
 SHA512:
-  metadata.gz: bf08091433a57d26df8e5fc92098e9e9b19a2693394c7006f60cfb86202f3856d848c2781eb1164436e47ba98ac9bb9e07319ca508092668f94b390735f28fdb
-  data.tar.gz: 6d5cba81e1169e57258fbd410aeaf5ab27a12155c93ad4ca7ec1b64b1fce6f7eca9b0fa57aa0dbaa9bcfa68118c67e0fe0dc64b16e9541cbd6ffb7b36b78012f
+  metadata.gz: ff4f9d234a111fe0d6815e8d6e4d60a003bfc1891a299b808ac89bfc62ef05f4f0146b770ea924c5a7c592852bfb613053ea41ae51344fcc86c2ed4b00c0ea6f
+  data.tar.gz: eed66811d98184c25ecaa8c8fcecc9a44b4dcf46f8cff4bd469af2131ce948c9eca1f0dfa3185d6e3f42f1411322934d74ba666daa0b014d2092cff0cb46a0c1

data/lib/crono_trigger/polling_thread.rb

@@ -5,6 +5,9 @@ module CronoTrigger
       @stop_flag = stop_flag
       @logger = logger
       @executor = executor
+      if @executor.fallback_policy != :caller_runs
+        raise ArgumentError, "executor's fallback policies except for :caller_runs are not supported"
+      end
       @execution_counter = execution_counter
       @quiet = Concurrent::AtomicBoolean.new(false)
     end
@@ -50,34 +53,28 @@ module CronoTrigger
     end
 
     def poll(model)
-      @logger.debug "(polling-thread-#{Thread.current.object_id}) Poll #{model}"
-      records = []
-      overflowed_record_ids = []
+      @logger.info "(polling-thread-#{Thread.current.object_id}) Poll #{model}"
 
-      begin
-        model.connection_pool.with_connection do
-          records = model.executables_with_lock
+      maybe_has_next = true
+      while maybe_has_next
+        records, maybe_has_next = model.connection_pool.with_connection do
+          model.executables_with_lock
         end
 
         records.each do |record|
-          begin
-            @executor.post do
-              @execution_counter.increment
-              begin
-                process_record(record)
-              ensure
-                @execution_counter.decrement
-              end
+          @executor.post do
+            @execution_counter.increment
+            begin
+              process_record(record)
+            ensure
+              @execution_counter.decrement
             end
-          rescue Concurrent::RejectedExecutionError
-            overflowed_record_ids << record.id
           end
         end
-        unlock_overflowed_records(model, overflowed_record_ids)
-      end while overflowed_record_ids.empty? && records.any?
+      end
     end
 
-    private 
+    private
 
     def process_record(record)
       record.class.connection_pool.with_connection do
@@ -88,16 +85,5 @@ module CronoTrigger
       @logger.error(ex)
       CronoTrigger::GlobalExceptionHandler.handle_global_exception(ex)
     end
-
-    def unlock_overflowed_records(model, overflowed_record_ids)
-      model.connection_pool.with_connection do
-        unless overflowed_record_ids.empty?
-          model.where(id: overflowed_record_ids).crono_trigger_unlock_all!
-        end
-      end
-    rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::LockWaitTimeout, ActiveRecord::StatementTimeout, ActiveRecord::Deadlocked
-      sleep 1
-      retry
-    end
   end
 end

data/lib/crono_trigger/schedulable.rb

@@ -34,7 +34,7 @@ module CronoTrigger
 
       define_model_callbacks :execute, :retry
 
-      scope :executables, ->(from: Time.current, limit: CronoTrigger.config.executor_thread * 3 || 100, including_locked: false) do
+      scope :executables, ->(from: Time.current, limit: CronoTrigger.config.executor_thread * 3, including_locked: false) do
         t = arel_table
 
         rel = where(t[crono_trigger_column_name(:next_execute_at)].lteq(from))
@@ -63,8 +63,9 @@ module CronoTrigger
     end
 
     module ClassMethods
-      def executables_with_lock(limit: CronoTrigger.config.executor_thread * 3 || 100)
+      def executables_with_lock(limit: CronoTrigger.config.executor_thread * 3)
         ids = executables(limit: limit).pluck(:id)
+        maybe_has_next = !ids.empty?
         records = []
         ids.each do |id|
           transaction do
@@ -75,7 +76,7 @@ module CronoTrigger
             end
           end
         end
-        records
+        [records, maybe_has_next]
       end
 
       def crono_trigger_column_name(name)

data/lib/crono_trigger/version.rb

@@ -1,3 +1,3 @@
 module CronoTrigger
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/crono_trigger/worker.rb

@@ -24,6 +24,7 @@ module CronoTrigger
         min_threads: 1,
         max_threads: CronoTrigger.config.executor_thread,
         max_queue: CronoTrigger.config.executor_thread * 2,
+        fallback_policy: :caller_runs,
       )
       @execution_counter = Concurrent::AtomicFixnum.new
       @logger = Logger.new(STDOUT) unless @logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono_trigger
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono