lib/openwfe/util/workqueue.rb in ruote-0.9.19 vs lib/openwfe/util/workqueue.rb in ruote-0.9.20

@@ -1,43 +1,29 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2007-2009, John Mettraux, [e-mail]
 #
-# 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 'thread'
 require 'openwfe/utils'
 
 
@@ -53,28 +39,39 @@
     def service_init (service_name, application_context)
 
       super
 
       @queue = Queue.new
-
       @stopped = false
 
-      thread_name = "#{service_name} (engine #{get_engine.object_id})"
+      #thread_name = "#{service_name} (engine #{get_engine.object_id})"
+      #OpenWFE::call_in_thread(thread_name, self) do
+      #  loop do
+      #    work = @queue.pop
+      #    break if work == :stop
+      #    target, method_name, args = work
+      #    target.send(method_name, *args)
+      #  end
+      #end
 
-      OpenWFE::call_in_thread thread_name, self do
+      # the workqueue warns and immediately resumes in case of error.
 
+      t = Thread.new do
         loop do
-
-          work = @queue.pop
-
-          break if work == :stop
-
-          target, method_name, args = work
-
-          target.send method_name, *args
+          begin
+            work = @queue.pop
+            break if work == :stop
+            target, method_name, args = work
+            target.send(method_name, *args)
+          rescue Exception => e
+            lwarn {
+              "#{caller_name} caught an exception\n#{OpenWFE.exception_to_s(e)}"
+            }
+          end
         end
       end
+      t[:name] = "#{service_name} (engine #{get_engine.object_id})"
     end
 
     #
     # Returns true if there is or there just was activity for the
     # work queue.
@@ -96,20 +93,24 @@
     # Stops the workqueue.
     #
     def stop
 
       @stopped = true
-      @queue.push :stop
+      @queue.push(:stop)
     end
 
     #
     # the method called by the mixer to actually queue the work.
     #
     def push (target, method_name, *args)
 
+      #fei = args.find { |e| e.respond_to?(:fei) }
+      #fei = fei.fei.to_s if fei
+      #p [ :push, method_name, args.find { |e| e.is_a?(Symbol) }, fei ]
+
       if @stopped
 
-        target.send method_name, *args
+        target.send(method_name, *args)
           #
           # degraded mode : as if there were no workqueue
       else
 
         @queue.push [ target, method_name, args ]