crono_trigger 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 035751ab4333491a769367b5d28fbace76bcb70806400cc10f6338c89b65e394
-  data.tar.gz: '0917037bd6064a166b2ff0a95d7ffa094e44a7ed54c8b08f120e593df41660bc'
+  metadata.gz: e3d3157a417d9c99b0da61ea75d9c9efc0af12a1f1f15cc3af121b4b3d673757
+  data.tar.gz: 52c3683c6e3116cfa34b41e83a6b830f63b0f65e4cf49377cc87548b4dc4c5f4
 SHA512:
-  metadata.gz: 27bd18f70a271450c1c316d3cdf10b837f1b0322026a72788373633be3743d20719654e40e2dba528f2b2f178deee893930a6a208984709bafcf3e40d9bb7ae7
-  data.tar.gz: 142f7e3a5fc634c81142bb254dae96e20a20d6efb6fb6a425ca01f7d77af2a89f43073296ce901127c4fef6fab9a4c5b6b679fd8033b0d019c3a79c8e490ad82
+  metadata.gz: 63f1eee5323fd5c1fff137c4d4204b06b9aca648d97d82cc3168fecda11d95d65d771a4b063615dbe4e5ac7b5767e888b02b4f3cbbafd09c912a122601060391
+  data.tar.gz: b30388357a341e278474d410b5a907e690ac1c97986b4e779fda3a4430d73b76c1aee8ea505cd5852223a63e9983b81b50b2a8a80d97cb9b44825b0071afeb2b

data/README.md

@@ -98,8 +98,9 @@ class MailNotification < ActiveRecord::Base
     execute_lock_timeout: 300,
   }
 
-  # `execute` callback is defined
+  # `execute`, `retry` callback is defined
   # can use `before_execute`, `after_execute`, `around_execute`
+  # `before_retry`, `after_retry`, `around_retry`
 
   # If execute method raise Exception, worker retry task until reach `retry_limit`
   # If `retry_count` reaches `retry_limit`, task schedule is reset.

data/lib/crono_trigger/schedulable.rb

@@ -30,7 +30,7 @@ module CronoTrigger
       self.crono_trigger_options ||= {}
       self.executable_conditions ||= []
 
-      define_model_callbacks :execute
+      define_model_callbacks :execute, :retry
 
       scope :executables, ->(from: Time.current, limit: CronoTrigger.config.executor_thread * 3 || 100, including_locked: false) do
         t = arel_table
@@ -156,21 +156,23 @@ module CronoTrigger
     end
 
     def retry!
-      logger.info "Retry #{self.class}-#{id}" if logger
-
-      now = Time.current
-      wait = crono_trigger_options[:exponential_backoff] ? retry_interval * [2 * (retry_count - 1), 1].max : retry_interval
-      attributes = {
-        crono_trigger_column_name(:next_execute_at) => now + wait,
-        crono_trigger_column_name(:execute_lock) => 0,
-        crono_trigger_column_name(:locked_by) => nil,
-      }
+      run_callbacks :retry do
+        logger.info "Retry #{self.class}-#{id}" if logger
+
+        now = Time.current
+        wait = crono_trigger_options[:exponential_backoff] ? retry_interval * [2 * (retry_count - 1), 1].max : retry_interval
+        attributes = {
+          crono_trigger_column_name(:next_execute_at) => now + wait,
+          crono_trigger_column_name(:execute_lock) => 0,
+          crono_trigger_column_name(:locked_by) => nil,
+        }
+
+        if self.class.column_names.include?("retry_count")
+          attributes.merge!(retry_count: retry_count.to_i + 1)
+        end
 
-      if self.class.column_names.include?("retry_count")
-        attributes.merge!(retry_count: retry_count.to_i + 1)
+        update_columns(attributes)
       end
-
-      update_columns(attributes)
     end
 
     def reset!(update_last_executed_at = true)

data/lib/crono_trigger/version.rb

@@ -1,3 +1,3 @@
 module CronoTrigger
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono_trigger
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono