queue_dispatcher 1.2.0 → 1.3.0

data/README.rdoc

@@ -32,11 +32,11 @@ Please check if all those requirements are satisfied on your environment.
 == Inside your application
 
 To enqueue a long running task, simple call a method through enque.
-E.g.: 
+E.g.:
 Assume, you have a long running job:
   LongRunningMailJob.send_mail
 
-Now we'd like to execute it in the background by simply calling: 
+Now we'd like to execute it in the background by simply calling:
   task = LongRunningMailJob.enqueue.send_mail
 
 If you like to put the job in a queue, you can do this by execute it the following way:
@@ -56,4 +56,4 @@ To start the QueueWorkerDispatcher as a daemon, use the option -b.
 This project is licenced under the MIT license.
 
 == Author
-Philip Kurmann (philip (at) kman.ch) 
+Philip Kurmann (philip (at) kman.ch)

data/app/views/queue_dispatcher_views/_task_event.html.haml

@@ -3,7 +3,7 @@
   - event_onclick = ""
 - else
   - event_class = "event pointer"
-  - event_onclick = onclick_to_remote :url => {:controller => 'tasks', :action => 'expand_event'}, :with => "'id=#{task.id}'"
+  - event_onclick = "jQuery('#task_#{task.id}_details').toggle(300);"
 
 - if @expanded_events.include? task.id
   - event_style = ""
@@ -20,7 +20,7 @@
       #{id_prefix}#{task.id}:
     = task.prosa
     - unless task.error_msg.blank?
-      = image_tag 'icon_expand.gif' 
+      = image_tag 'icon_expand.gif'
       %div{:id => "task_#{task.id}_details", :class => 'qd_error_msg', :style => event_style}
         = task.error_msg
         %br

data/app/views/queue_dispatcher_views/_task_my_event.html.haml

@@ -3,7 +3,7 @@
   - event_onclick = ""
 - else
   - event_class = "event pointer"
-  - event_onclick = onclick_to_remote :url => {:action => 'expand_event'}, :with => "'id=#{task.id}'"
+  - event_onclick = "jQuery('#task_#{task.id}_details').toggle(300);"
 
 - if @expanded_events.include? task.id
   - event_style = ""
@@ -20,7 +20,7 @@
       #{id_prefix}#{task.id}:
     = task.prosa
     - unless task.error_msg.blank?
-      = image_tag 'icon_expand.gif' 
+      = image_tag 'icon_expand.gif'
       %div{:id => "task_#{task.id}_details", :class => 'qd_error_msg', :style => event_style}
         = task.error_msg
         %br

data/app/views/queue_dispatcher_views/my_events.html.haml

@@ -1,7 +1,17 @@
 - title "Tasks and Events"
-= periodically_call_remote :url => {:action => 'my_events'},
-                           :frequency => 5,
-                           :condition => 'running_task_queues'
+:javascript
+  $(document).ready(function(){
+    setInterval(update_task_list, 5000);
+  });
+
+  function update_task_list(){
+    if (running_task_queues == true) {
+      $.ajax({url: "#{url_for :action => 'my_events'}", type: "POST", dataType: "script" });
+    }
+    running_task_queues = #{TaskQueue.any_running?};
+
+  };
+
 = render :partial => 'queue_dispatcher_views/search_results_my_events'
 %br/
 = will_paginate @tasks

data/app/views/queue_dispatcher_views/update_events.js.erb

@@ -9,7 +9,7 @@
 <% end %>
 
 <% @deleted_task_ids.each do |id| %>
-  jQuery('#task_<%= id %>).fadeOut();
+  jQuery('#task_<%= id %>').fadeOut();
 <% end %>
 
 <%= update_flash %>

data/lib/generators/queue_dispatcher/migration/templates/task_queues.rb

@@ -5,6 +5,7 @@ class CreateTaskQueues < ActiveRecord::Migration
       t.string :state
       t.integer :pid
       t.boolean :terminate_immediately
+      t.string :interrupts
 
       t.timestamps
     end

data/lib/generators/queue_dispatcher/migration/templates/tasks.rb

@@ -12,7 +12,7 @@ class CreateTasks < ActiveRecord::Migration
       t.text :output
       t.text :error_msg
       t.integer :task_queue_id
-  
+
       t.timestamps
     end
 

data/lib/queue_dispatcher/acts_as_task_queue.rb

@@ -14,6 +14,7 @@ module QueueDispatcher
       attr_reader :leave_running_tasks_in_queue
       attr_reader :leave_finished_tasks_in_queue
       attr_reader :idle_wait_time
+      attr_reader :task_finish_wait_time
       attr_reader :poll_time
       attr_reader :debug
 
@@ -23,6 +24,7 @@ module QueueDispatcher
         @leave_running_tasks_in_queue  = args[:leave_running_tasks_in_queue].nil? ? false : args[:leave_running_tasks_in_queue]
         @leave_running_tasks_in_queue  = true if @leave_finished_tasks_in_queue
         @idle_wait_time                = args[:idle_wait_time] || 0
+        @task_finish_wait_time         = args[:task_finish_wait_time] || 0
         @poll_time                     = args[:poll_time] || 2.seconds
         @debug                         = args[:debug]
       end
@@ -41,6 +43,7 @@ module QueueDispatcher
         @acts_as_task_queue_config = QueueDispatcher::ActsAsTaskQueue::Config.new(args)
 
         has_many acts_as_task_queue_config.task_class_name.pluralize, :order => [:priority, :id]
+        serialize :interrupts, Array
       end
     end
 
@@ -331,6 +334,9 @@ module QueueDispatcher
               cleanup_locks_after_error_for task
               task.update_attribute :task_queue_id, nil unless acts_as_task_queue_config.leave_finished_tasks_in_queue
               log :msg => "#{name}: Task #{task.id} (#{task.target.class.name}.#{task.method_name}) finished with state '#{task.state}'.", :print_log => print_log
+
+              # Wait between tasks
+              sleep acts_as_task_queue_config.task_finish_wait_time
             end
           else
             # We couldn't fetch a task out of the queue but there should still exists some. Maybe some are waiting for dependent tasks.
@@ -338,6 +344,9 @@ module QueueDispatcher
             sleep acts_as_task_queue_config.poll_time
           end
 
+          # Interrupts
+          handle_interrupts print_log: print_log
+
           # Reload task_queue to get all updates
           task_queue = TaskQueue.find_by_id task_queue.id
 
@@ -472,6 +481,16 @@ module QueueDispatcher
         #log :msg => "#{name}: Reloading config...", :print_log => args[:print_log]
       end
 
+
+      # Interrupt handler
+      def handle_interrupts(args = {})
+        interrupts.each { |int| send int.to_sym }
+        update_attributes interrupts: []
+      rescue => exception
+        backtrace = exception.backtrace.join("\n  ")
+        log :msg => "Fatal error in method 'handle_interrupts': #{$!}\n  #{backtrace}", :sev => :error, :print_log => arg[:print_log]
+      end
+
     end
   end
 end

data/lib/queue_dispatcher/version.rb

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

data/script/queue_worker_dispatcher

@@ -142,7 +142,7 @@ def daemon_start
       File.delete($daemon[:pid_file])
     end
   end
- 
+
   daemon_log :msg => "Starting process..."
   if $daemon[:background]
     spawn_block { daemon_runner }
@@ -227,30 +227,30 @@ def daemon_show_usage
 end
 
 
-# Parse command line options 
+# Parse command line options
 def daemon_parse_opts
   start = true
 
-  unless DAEMON_ARGV.length == 0 
+  unless DAEMON_ARGV.length == 0
     case DAEMON_ARGV[0]
       when '-b', '--background'
         $daemon[:background] = true;
-   
+
       when '-v', '--version'
         daemon_show_version
         start = false
-   
+
       when '-h', '--help'
         daemon_show_usage
         start = false
-   
+
       else
         puts "Invalid argument: #{DAEMON_ARGV[0]}" if !DAEMON_ARGV[0].nil?
         daemon_show_usage
         start = false
     end
   end
- 
+
   start
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_dispatcher
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -137,7 +137,6 @@ files:
 - app/views/queue_dispatcher_views/_task_footer.html.erb
 - app/views/queue_dispatcher_views/_task_header.html.erb
 - app/views/queue_dispatcher_views/_task_my_event.html.haml
-- app/views/queue_dispatcher_views/expand_event.js.rjs
 - app/views/queue_dispatcher_views/my_events.html.haml
 - app/views/queue_dispatcher_views/my_events.js.erb
 - app/views/queue_dispatcher_views/update_events.js.erb

data/app/views/queue_dispatcher_views/expand_event.js.rjs

@@ -1 +0,0 @@
-page.visual_effect :toggle_blind, "task_#{@task.id}_details", :duration => 0.1