crono_trigger 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1befee8d18a2c52458baa240cc2b12a8d9fea015a53647c0f098cae21d062d
-  data.tar.gz: c6fad9a37fdf912c88712c93b64ace75386b9c2f37cdc9bcf609de711a7b8939
+  metadata.gz: ecbd02943a3f5c0feb5dcf4334620908db415b0b6686a085e5f93d0d80bc0cf8
+  data.tar.gz: 6b57f0fee70f788bd50a193776c279104599c41289c5397942940a4a4d4817d0
 SHA512:
-  metadata.gz: 7d383986c2c68d31dbe6fa681599816e564c07dfa3bba92c4edf9cb8b581b934293636446d97a85c2fec87f64af9cd2c81b7ec6edcfc89fe9c905dac6ce1eaf3
-  data.tar.gz: 4940e47e60802b4cf2caab3eee22069ba61e1f81b0178b1f696c485c330b5b5340d9d058764f70e40a608839cb2d35354ea877e3bbe32c9377d61fbbaa71233c
+  metadata.gz: 6ab99ff92c4f71a8dc5a38a57016da53605e9a3cba0441fbebe62a30788352ac591af92975929a84d730007f958c241ab2de52f057ddcfa0fa6e34f713bad596
+  data.tar.gz: 80cbcd2b1bf047608d82f61adfaa3fdfd3a1da5189e4ab346edc8855f5d7884a0bb3337d426536b57c796fffd412682f0c6e255da9fe00e37e022753ad9bb98b

data/lib/crono_trigger/execution_tracker.rb

@@ -8,7 +8,9 @@ module CronoTrigger
       if @schedulable.track_execution
         begin
           execution = @schedulable.crono_trigger_executions.create_with_timestamp!
+          p "fuuuuuuu"
           pr.call
+          p "hogehoge"
           execution.complete!
         rescue => e
           execution.error!(e)

data/lib/crono_trigger/schedulable.rb

@@ -21,6 +21,7 @@ module CronoTrigger
     end
 
     class AbortExecution < StandardError; end
+    class RetryExecution < StandardError; end
 
     extend ActiveSupport::Concern
     include ActiveSupport::Callbacks
@@ -113,21 +114,21 @@ module CronoTrigger
     def do_execute
       execution_tracker = ExecutionTracker.new(self)
       run_callbacks :execute do
-        catch(:ok_without_reset) do
-          catch(:ok) do
-            catch(:retry) do
-              catch(:abort) do
-                execution_tracker.track do
+        execution_tracker.track do
+          catch(:ok_without_reset) do
+            catch(:ok) do
+              catch(:retry) do
+                catch(:abort) do
                   execute
+                  throw :ok
                 end
-                throw :ok
+                raise AbortExecution
               end
-              raise AbortExecution
+              retry!
+              raise RetryExecution
             end
-            retry!
-            return
+            reset!
           end
-          reset!
         end
       end
     rescue AbortExecution => ex
@@ -135,6 +136,8 @@ module CronoTrigger
       reset!(false)
 
       raise
+    rescue RetryExecution => ex
+      save_last_error_info(ex)
     rescue Exception => ex
       save_last_error_info(ex)
       retry_or_reset!(ex)

data/lib/crono_trigger/version.rb

@@ -1,3 +1,3 @@
 module CronoTrigger
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crono_trigger
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chrono