queue_dispatcher 1.1.19 → 1.2.0

data/LICENSE

@@ -1,5 +1,7 @@
 Copyright (c) 2011-2012 Philip Kurmann
 
+MIT License
+
 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

data/README.rdoc

@@ -52,6 +52,8 @@ The QueueWorkerDispatcher-script starts the workers (default are 10 workers). A
 To start the QueueWorkerDispatcher as a daemon, use the option -b.
   -b, --background        work in background mode
 
-== Copyright
+== License
+This project is licenced under the MIT license.
 
-Copyright (c) 2011 - 2012 Philip Kurmann. See LICENSE for details.
+== Author
+Philip Kurmann (philip (at) kman.ch) 

data/app/helpers/tasks_helper.rb

@@ -26,6 +26,9 @@ module TasksHelper
     elsif task.error?
       icon = 'icon_error.png'
       alt  = 'Error!'
+    elsif task.aborted?
+      icon = 'icon_aborted.png'
+      alt  = 'Aborted!'
     end
 
     image_tag(icon, :alt => alt)

data/lib/queue_dispatcher/acts_as_task_queue.rb

@@ -81,6 +81,24 @@ module QueueDispatcher
           self.where(:name => name).where("state != 'error'").first || self.create(:name => name, :state => 'new', terminate_immediately: options[:terminate_immediately])
         end
       end
+
+
+      # Kill all running TaskQueues immediately and destroy them.
+      def reset_immediately!
+        all.each do |tq|
+          tq.update_attributes state: 'aborted'
+
+          # Kill the TaskQueue with SIGKILL
+          Process.kill 'KILL', tq.pid if tq.pid_running?
+
+          # Update task_state to aborted and release all its locks
+          tq.tasks.each do |task|
+            task.update_attributes state: 'aborted' unless task.state == 'successful' || task.state == 'finished'
+            tq.send(:release_lock_for, task)
+          end
+          tq.destroy
+        end
+      end
     end
 
 
@@ -146,6 +164,8 @@ module QueueDispatcher
           :acquire_lock
         elsif states[:error]
           :error
+        elsif states[:aborted]
+          :aborted
         elsif states[:new]
           :new
         elsif states[:successful]
@@ -386,6 +406,7 @@ module QueueDispatcher
         new = true
         pending = false
         error = false
+        aborted = false
         running = false
         acquire_lock = false
         init_queue = false
@@ -397,6 +418,7 @@ module QueueDispatcher
           new = false unless task.state == 'new' || task.state == 'new_popped' || task.state == 'build'
           pending = true if (task.state == 'new' || task.state == 'new_popped' || task.state == 'build' || task.state == 'pending')
           error = true if task.state == 'error'
+          aborted = true if task.state == 'aborted'
           init_queue = true if task.state == 'init_queue'
         end
 
@@ -406,6 +428,7 @@ module QueueDispatcher
          :new          => new,
          :pending      => pending,
          :error        => error,
+         :aborted      => aborted,
          :empty        => task_array.empty?,
          :init_queu    => init_queue}
       end

data/lib/queue_dispatcher/version.rb

@@ -1,3 +1,3 @@
 module QueueDispatcher
-  VERSION = "1.1.19"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_dispatcher
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -119,6 +119,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/images/icon_aborted.png
 - app/assets/images/icon_acquire_lock.png
 - app/assets/images/icon_error.png
 - app/assets/images/icon_init_queue.gif
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: This Gem installs a queue dispatcher for handling asynchronous tasks