queue_dispatcher 1.1.5 → 1.1.6

data/lib/queue_dispatcher/acts_as_task_queue.rb

@@ -15,6 +15,7 @@ module QueueDispatcher
       attr_reader :leave_finished_tasks_in_queue
       attr_reader :idle_wait_time
       attr_reader :poll_time
+      attr_reader :debug
 
       def initialize(args)
         @task_class_name               = (args[:task_model] || :task).to_s.underscore
@@ -23,6 +24,7 @@ module QueueDispatcher
         @leave_running_tasks_in_queue  = true if @leave_finished_tasks_in_queue
         @idle_wait_time                = args[:idle_wait_time] || 0
         @poll_time                     = args[:poll_time] || 2.seconds
+        @debug                         = args[:debug]
       end
     end
 
@@ -97,7 +99,8 @@ module QueueDispatcher
       # Get the next ready to run task out of the queue. Consider the priority and the dependent tasks, which is defined in the association defined on
       # top of this model.
       def pop args = {}
-        task                = nil
+        task      = nil
+        log_debug = acts_as_task_queue_config.debug
 
         transaction do
           # Find next pending task, where all dependent tasks are executed
@@ -108,8 +111,7 @@ module QueueDispatcher
             if t.dependent_tasks_executed?
               task = t if t.state == 'new'
             else
-              log :msg => "Task #{t.id}: Waiting for dependent tasks #{t.dependent_tasks.map{|dt| dt.id}.join ','}...",
-                  :sev => :debug
+              log :msg => "Task #{t.id}: Waiting for dependent tasks #{t.dependent_tasks.map{|dt| dt.id}.join ','}...", :sev => :debug if log_debug
             end
             i += 1
           end

data/lib/queue_dispatcher/rc_and_msg.rb

@@ -3,7 +3,7 @@ module QueueDispatcher
     attr_accessor :rc, :output, :error_msg
 
 
-    def self.good_rc(output, args = {})
+    def self.good_rc(output = '', args = {})
       rc_and_msg = new
       rc_and_msg.good_rc(output, args)
     end
@@ -46,8 +46,8 @@ module QueueDispatcher
     def +(other)
       rc_and_msg = self.clone
       rc_and_msg.rc += other.rc
-      rc_and_msg.output += "\n#{other.output}" if other.output.present?
-      rc_and_msg.error_msg += "\n#{other.error_msg}" if other.error_msg.present?
+      rc_and_msg.output = rc_and_msg.output ? "#{output}\n#{other.output}" : other.output if other.output.present?
+      rc_and_msg.error_msg = rc_and_msg.error_msg ? "#{error_msg}\n#{other.error_msg}" : other.error_msg if other.error_msg.present?
       rc_and_msg
     end
 

data/lib/queue_dispatcher/version.rb

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

metadata

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