lib/ruote/exp/fe_once.rb in ruote-2.2.0 vs lib/ruote/exp/fe_once.rb in ruote-2.3.0

@@ -1,7 +1,7 @@
 #--
-# Copyright (c) 2005-2011, John Mettraux, [e-mail]
+# Copyright (c) 2005-2012, John Mettraux, [e-mail]
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
@@ -147,11 +147,10 @@
 
     def apply
 
       h.frequency = attribute(:frequency) || attribute(:freq) || '10s'
       h.triggered = false
-      h.job_id = nil
 
       reply(h.applied_workitem)
     end
 
     def reply(workitem)
@@ -162,48 +161,40 @@
 
       if Condition.true?(t)
 
         h.triggered = true
 
-        @context.storage.delete_schedule(h.job_id)
+        @context.storage.delete_schedule(h.schedule_id)
           # especially for a cron...
 
-        if tree_children[0]
-          #
-          # trigger first child
-          #
+        if tree_children[0] # trigger first child
+
           apply_child(0, workitem)
-        else
-          #
-          # blocking case
-          #
+
+        else # blocking case
+
           reply_to_parent(workitem)
         end
+
       else
 
         reschedule
       end
     end
 
-    def cancel(flavour)
-
-      @context.storage.delete_schedule(h.job_id)
-      super
-    end
-
     protected
 
     def reschedule
 
-      h.job_id = @context.storage.put_schedule(
+      h.schedule_id = @context.storage.put_schedule(
         'cron',
         h.fei,
         h.frequency,
         'action' => 'reply',
         'fei' => h.fei,
         'workitem' => h.applied_workitem)
 
-      @context.storage.delete_schedule(h.job_id) if try_persist
+      @context.storage.delete_schedule(h.schedule_id) if try_persist
         #
         # if the persist failed, immediately unschedule
         # the just scheduled job
         #
         # this is meant to cope with cases where one worker reschedules