queue_dispatcher 1.1.6 → 1.1.7

data/lib/queue_dispatcher/acts_as_task_queue.rb

@@ -337,9 +337,6 @@ module QueueDispatcher
           reload_config task, print_log: print_log
         end
 
-        # Delete task_queue
-        task_queue.destroy_if_all_done! if task_queue
-
         # Loop has ended
         log :msg => "#{name}: TaskQueue has ended!", :print_log => print_log
         finish_state = 'stopped'
@@ -350,12 +347,15 @@ module QueueDispatcher
         puts "Fatal error in method 'run!': #{$!}\n#{backtrace}"
         task.update_state QueueDispatcher::RcAndMsg.bad_rc("Fatal error: #{$!}") if task
         cleanup_locks_after_error_for task if task
-        finish_state = 'error'
+        task.update_attribute state: 'error' if task && task.state != 'finished'
       ensure
         # Reload task and task_queue, to ensure the objects are up to date
         task_queue = TaskQueue.find_by_id task_queue.id if task_queue
         task       = Task.find_by_id task.id if task
 
+        # Delete task_queue
+        task_queue.destroy_if_all_done! if task_queue
+
         # Update states of task and task_queue
         task.update_attributes :state => 'aborted' if task && task.state == 'running'
         task_queue.update_attributes :state => finish_state, :pid   => nil if task_queue

data/lib/queue_dispatcher/version.rb

@@ -1,3 +1,3 @@
 module QueueDispatcher
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/script/queue_worker_dispatcher

@@ -190,6 +190,7 @@ def worker_runner
 
   # Fetch pending task queues and start working
   while $worker[:work] do
+    # Get next pending taskqueue
     $worker[:task_queue] = $daemon[:task_queue_model].get_next_pending
 
     if $worker[:task_queue]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_dispatcher
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable