lib/ruote/exp/fe_cron.rb in ruote-2.2.0 vs lib/ruote/exp/fe_cron.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
@@ -92,11 +92,10 @@
     names :cron, :every
 
     def apply
 
       h.schedule = attribute(:tab) || attribute(:interval) || attribute_text
-      h.job_id = nil
 
       reschedule
     end
 
     def reply(workitem)
@@ -108,28 +107,22 @@
         :forget => true)
 
       reschedule
     end
 
-    def cancel(flavour)
-
-      @context.storage.delete_schedule(h.job_id)
-      reply_to_parent(h.applied_workitem)
-    end
-
     # Note : this method has to be public.
     #
     def reschedule
 
-      h.job_id = @context.storage.put_schedule(
+      h.schedule_id = @context.storage.put_schedule(
         'cron',
         h.fei,
         h.schedule,
         '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