rocketjob 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf1e6e7eb0a44011830a99c689c56768857d8de4c4e2c95e6b536feb6f63aab
-  data.tar.gz: '0172629dc33a08bfbd976599b619a41495680124dcd7df9a08e61308f0d043b4'
+  metadata.gz: 97910a2bbdcc67b808677e01f9ef9650935deac9f47ee415ad7665227e06e2a3
+  data.tar.gz: 9c560b2a1deea93eb4c8e9cdf6fb28f2308e8f9a85457660c292ad38a2b76137
 SHA512:
-  metadata.gz: 6ac52c54834a7370dfdb9e7460ca1818c19b91beb2afc875ba0edab63a9b0d9480bc704a35bd155825f3c0b280efea9a406783212e8621fcbf6b046b8af62e78
-  data.tar.gz: f044d85630a0b6b36b07f7092ec18ac452d608cb9c7dbb7d26235493c51df584d7479190b24dfd1805ba7a086c8188e48ab8b02590d0748d013c6fb462b01505
+  metadata.gz: 768538825ba34f58d915205fb1c61066ef2d86d9c3743f487db381074e30bd75c420f99f017adbb338c0dd4f202a69cf699b0b4e2a9ebc0581423fb102c85284
+  data.tar.gz: 17d494818bf341a6b3340f4c0c5d5b77ec68c05eeb26d10eccb43c81221c14acd64ffe73ea1f610b514f233c84d5cc7cf3c2a10f4d1410b9b427308d22f5ad53

data/lib/rocket_job/batch/throttle_running_workers.rb

@@ -47,24 +47,19 @@ module RocketJob
 
       # Returns [Boolean] whether the throttle for this job has been exceeded
       def throttle_running_workers_exceeded?(slice)
-        return unless throttle_running_workers&.positive?
+        return false unless throttle_running_workers&.positive?
 
         input.running.with(read: {mode: :primary}) do |conn|
           conn.where(:id.ne => slice.id).count >= throttle_running_workers
         end
       end
 
-      # Returns [Boolean] whether the throttle for this job has been exceeded
-      #
-      # With a Batch job, allow a higher priority queued job to replace a running one with
-      # a lower priority.
-      def throttle_running_jobs_exceeded?
-        return unless throttle_running_jobs&.positive?
-
-        # Cannot use this class since it will include instances of parent job classes.
-        RocketJob::Job.with(read: {mode: :primary}) do |conn|
-          conn.running.where("_type" => self.class.name, :id.ne => id, :priority.lte => priority).count >= throttle_running_jobs
-        end
+      # Allows another job with a higher priority to start even though this one is running already
+      # @overrides RocketJob::Plugins::Job::ThrottleRunningJobs#throttle_running_jobs_base_query
+      def throttle_running_jobs_base_query
+        query = super
+        query[:priority.lte] = priority if throttle_running_workers&.positive?
+        query
       end
     end
   end

data/lib/rocket_job/plugins/job/throttle_running_jobs.rb

@@ -39,14 +39,18 @@ module RocketJob
 
         # Returns [Boolean] whether the throttle for this job has been exceeded
         def throttle_running_jobs_exceeded?
-          return unless throttle_running_jobs&.positive?
+          return false unless throttle_running_jobs&.positive?
 
           RocketJob::Job.with(read: {mode: :primary}) do |conn|
-            query = {:id.ne => id}
+            query = throttle_running_jobs_base_query
             throttle_group ? query["throttle_group"] = throttle_group : query["_type"] = self.class.name
             conn.running.where(query).count >= throttle_running_jobs
           end
         end
+
+        def throttle_running_jobs_base_query
+          {:id.ne => id}
+        end
       end
     end
   end

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = "5.4.0".freeze
+  VERSION = "5.4.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm