crono_trigger 0.6.1 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8291c00c8a9dc2060ed8f3a20aff6702f6ca66e7249b312da85cbd974f04d53d
-  data.tar.gz: dbd1dd5716a3248ca338e678ec429962b14d59da9656070099789f8ede7dd317
+  metadata.gz: abf6e6cece7b22f0d5aad026d0d08bb4d8e8f9cb711616e8adcd14e0437995e0
+  data.tar.gz: 56f7d508538e8349ee212b280d5828142934d88d16edd8d730d62909fd80780e
 SHA512:
-  metadata.gz: 133b4e3ed8bfe18df41c676cb454ac26a178676e2e814a889a44ace13988bac71df4b90768048185115f55d05f3e79441011cc1aa1f6d498ef8171b6e0b833b2
-  data.tar.gz: c1737966af7a2780436c1b30a87fe45c9c2af1f5a2ccbb9540e8e06c76cb1992088b8d66a0156003e58c575a1183905bae16752543912ba3c4848189b8d30949
+  metadata.gz: e738ec527622411944b8582ad9210b2a093bb71b55c9c6cb1a7a3005416bca62b388e5350f43656e9c69ab1bf8642a7d1e55f09999ef8c42341e4253bfbb0b59
+  data.tar.gz: ce2badf5898fe3457145f89465b22158d6955e0d808eb3556f551f8f37b62922ddd13fa918f9c40ce4ecfd82204b66d50909a38c1a582b0b9ccd51469a185642

data/.github/workflows/rspec.yml

@@ -0,0 +1,27 @@
+name: RSpec
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/README.md

@@ -1,6 +1,6 @@
 # CronoTrigger
 [![Gem Version](https://badge.fury.io/rb/crono_trigger.svg)](https://badge.fury.io/rb/crono_trigger)
-[![Build Status](https://travis-ci.org/joker1007/crono_trigger.svg?branch=master)](https://travis-ci.org/joker1007/crono_trigger)
+![rspec](https://github.com/joker1007/crono_trigger/actions/workflows/rspec.yml/badge.svg)
 [![codecov](https://codecov.io/gh/joker1007/crono_trigger/branch/master/graph/badge.svg)](https://codecov.io/gh/joker1007/crono_trigger)
 
 Asynchronous Job Scheduler for Rails.
@@ -137,10 +137,17 @@ mail.next_execute_at # => next 13:00 with Asia/Japan
 
 #### Run Worker
 
+ues `crono_trigger` command.
+`crono_trigger` command accepts model class names.
+
+For example,
+
 ```
 $ crono_trigger MailNotification
 ```
 
+And other options is following.
+
 ```
 $ crono_trigger --help
 Usage: crono_trigger [options] MODEL [MODEL..]

data/lib/crono_trigger/cli.rb

@@ -31,7 +31,7 @@ opt_parser = OptionParser.new do |opts|
   end
 
   opts.on("-c", "--concurrency=SIZE", Integer, "Execute thread size (Default: 25)") do |i|
-    options[:execute_thread] = i
+    options[:executor_thread] = i
   end
 
   opts.on("-l", "--log=LOGFILE", "Set log output destination (Default: STDOUT or ./crono_trigger.log if daemonize is true)") do |log|
@@ -67,7 +67,7 @@ end
 
 CronoTrigger.load_config(options[:config], options[:env]) if options[:config]
 
-%i(polling_thread polling_interval execute_thread).each do |name|
+%i(worker_id polling_thread polling_interval executor_thread).each do |name|
   CronoTrigger.config[name] = options[name] if options[name]
 end
 

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 && !@stop_flag.set?
+        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.1"
+  VERSION = "0.6.4"
 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.1
+  version: 0.6.4
 platform: ruby
 authors:
 - joker1007
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono
@@ -244,6 +244,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -324,7 +325,7 @@ homepage: https://github.com/joker1007/crono_trigger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -339,8 +340,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: In Service Asynchronous Job Scheduler for Rails
 test_files: []