fe_cron.rb in ruote-0.9.20

- old
+ new

@@ -1,43 +1,29 @@
-#
 #--
-# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# 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
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/utils'
 require 'openwfe/expressions/time'
 
 
@@ -93,12 +79,10 @@
   #
   class CronExpression < TimeExpression
 
     names :cron
 
-    uses_template
-
     #
     # The cron 'tab', something like "0 9-17 * * mon-fri"
     #
     attr_accessor :tab
 
@@ -114,32 +98,30 @@
     attr_accessor :counter
 
 
     def apply (workitem)
 
-      return reply_to_parent(workitem) \
-        if raw_children.size < 1
+      return reply_to_parent(workitem) if has_no_expression_child
 
-      @counter = 0
-      #@engine_cron = false
+      @counter = -1
 
       @applied_workitem = workitem.dup
       @applied_workitem.flow_expression_id = nil
 
-      @tab = lookup_attribute :tab, workitem
-      @every = lookup_attribute :every, workitem
+      @tab = lookup_attribute(:tab, workitem)
+      @every = lookup_attribute(:every, workitem)
 
       determine_scheduler_tags
 
       #
       # schedule self
 
-      reschedule get_scheduler
+      reschedule(get_scheduler)
     end
 
     def reply (workitem)
-      # discard silently... should never get called though
+      # discard silently...
     end
 
     #
     # This is the method called each time the scheduler triggers
     # this cron. The contained segment of process will get
@@ -150,35 +132,36 @@
       return if paused?
 
       ldebug { "trigger() cron : #{@fei.to_debug_s}" }
 
       #@raw_child.application_context = @application_context
-        # done in expool.launch_template()
+        # done in expool.tlaunch_child()
 
       begin
 
-        #template = @raw_child
-        #template, _fei = get_expression_pool.fetch @children[0]
-        template = raw_children.first
+        @counter += 1
+        store_itself
+          #
+          # note : one variant would be to give Time.now.to_f as a sub_id...
+          # then no need to store...
+          #
+          # but it's good to have a counter to keep track of the number of
+          # executions
 
         child_fei = get_expression_pool.tlaunch_child(
-          self, template, @counter, @applied_workitem.dup, false)
+          self,
+          first_expression_child,
+          @counter,
+          @applied_workitem.dup,
+          :register_child => false)
             #
             # register_child is set to false, cron doesn't keep
             # track of its spawned children
 
-        #
-        # update count and store self
-
-        @counter += 1
-
-        store_itself
-
       rescue
 
         lerror do
-          "trigger() cron caught exception\n"+
-          OpenWFE::exception_to_s($!)
+          "trigger() cron caught exception\n#{OpenWFE::exception_to_s($!)}"
         end
       end
     end
 
     #