throttle.rb in rocketjob-3.0.5

- old
+ new

@@ -6,11 +6,11 @@
       # Throttle number of jobs of a specific class that are processed at the same time.
       #
       # Example:
       #   class MyJob < RocketJob
       #     # Maximum number of workers to process instances of this job at the same time.
-      #     self.throttle_max_workers = 25
+      #     self.throttle_running_jobs = 25
       #
       #     def perform
       #       # ....
       #     end
       #   end
@@ -21,11 +21,11 @@
       # - By avoid hard locks and counters performance can be maintained while still
       #   supporting good enough throttling.
       # - If throughput is not as important as preventing brief spikes when many
       #   workers are running, add a double check into the perform:
       #     class MyJob < RocketJob
-      #       self.throttle_max_workers = 25
+      #       self.throttle_running_jobs = 25
       #
       #       def perform
       #         # (Optional) Prevent a brief spike from exceeding the wax worker throttle
       #         self.class.throttle_double_check
       #
@@ -34,42 +34,41 @@
       #     end
       module Throttle
         extend ActiveSupport::Concern
 
         included do
-          class_attribute :throttle_max_workers
-          self.throttle_max_workers = nil
+          class_attribute :throttle_running_jobs
+          self.throttle_running_jobs = nil
         end
 
         # Throttle to add when the throttle is exceeded
         def throttle_filter
           {:_type.nin => [self.class.name]}
         end
 
         # Returns [Boolean] whether the throttle for this job has been exceeded
         def throttle_exceeded?
-          throttle_max_workers && (throttle_max_workers != 0) ? (self.class.running.count >= throttle_max_workers) : false
+          throttle_running_jobs && (throttle_running_jobs != 0) ? (self.class.running.where(:id.ne => id).count >= throttle_running_jobs) : false
         end
 
         # Prevent a brief spike from exceeding the wax worker throttle
         def throttle_double_check(check_seconds = 1)
           while !throttle_exceeded?
             sleep check_seconds
           end
         end
 
-        private
-
         # Merge filter(s)
         def throttle_merge_filter(target, source)
           source.each_pair do |k, v|
             target[k] =
               if previous = target[k]
                 v.is_a?(Array) ? previous + v : v
               else
                 v
               end
           end
+          target
         end
 
       end
 
     end