inst-jobs 3.1.5 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adf88a85cf490a4fee0b3e8b5234be47b0f70034f6a89489ace8a132c74886d
-  data.tar.gz: '07836a394917c38fcb1cba64a9a1988f3c949bb7e147247f759da8f860382a7f'
+  metadata.gz: 0475c3b076cb2d06a380ab5439899071d7b242f0b984efc656c07cdac42a30ef
+  data.tar.gz: 6b327fe5fa9e90ff3e0a9cc6fbbf3bf141fac324999c7b3fe4b86c60196ddab0
 SHA512:
-  metadata.gz: 8fc62248de29a57be2044a0949299ac26475df434c4906f0786293bb07b3a7bf63fb1c2b79c3e230e992825984e76417eb9ad221a46bac5c78b92d305c2db638
-  data.tar.gz: 44a04dcfd05ecad3345bd9da25909711912edaaf16e9f6a502859765319de33e0a59ac840571b5f5e543b76ce40b43550ab9a750e56753c60c29886002894201
+  metadata.gz: fc255ab122c9744ba5222125898d43d12e668d091c5ad7f034693e5ce6d224be21c107caf67261d3bdef03b55f481baa4d0d3912e3c9bff8e1039d8ff12f3f35
+  data.tar.gz: 6a7d73a994637c0241d54da38e98a8c25008345622b9410a867da603740c6eb8133e7bb1d36e8dd62d479148e7bf43bc5e0ea0f1a59f63dd1f0b8a7763467e19

data/lib/delayed/backend/active_record.rb

@@ -320,6 +320,24 @@ module Delayed
           scope.order(Arel.sql("COUNT(tag) DESC")).count.map { |t, c| { tag: t, count: c } }
         end
 
+        # given a scope of non-stranded queued jobs, apply a temporary strand to throttle their execution
+        # returns [job_count, new_strand]
+        # (this is designed for use in a Rails console or the Canvas Jobs interface)
+        def self.apply_temp_strand!(job_scope, max_concurrent: 1)
+          if job_scope.where("strand IS NOT NULL OR singleton IS NOT NULL").exists?
+            raise ArgumentError, "can't apply strand to already stranded jobs"
+          end
+
+          job_count = 0
+          new_strand = "tmp_strand_#{SecureRandom.alphanumeric(16)}"
+          ::Delayed::Job.transaction do
+            job_count = job_scope.update_all(strand: new_strand, max_concurrent: max_concurrent, next_in_strand: false)
+            ::Delayed::Job.where(strand: new_strand).order(:id).limit(max_concurrent).update_all(next_in_strand: true)
+          end
+
+          [job_count, new_strand]
+        end
+
         def self.maybe_silence_periodic_log(&block)
           if Settings.silence_periodic_log
             ::ActiveRecord::Base.logger.silence(&block)

data/lib/delayed/backend/base.rb

@@ -269,7 +269,7 @@ module Delayed
       end
 
       def payload_object
-        @payload_object ||= deserialize(self["handler"].untaint)
+        @payload_object ||= deserialize(self["handler"])
       end
 
       def name

data/lib/delayed/batch.rb

@@ -44,7 +44,7 @@ module Delayed
         Delayed::Job.batches = nil
         batch_args = opts.slice(:priority)
         batches.each do |enqueue_args, batch|
-          next if batch.size.zero?
+          next if batch.empty?
 
           if batch.size == 1
             args = batch.first.merge(batch_args)

data/lib/delayed/message_sending.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "debug_inspector" if ::Rails.env.test? || ::Rails.env.development?
+require "debug_inspector" if Rails.env.test? || Rails.env.development?
 
 module Delayed
   module MessageSending

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.5"
+  VERSION = "3.1.7"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.7
 platform: ruby
 authors:
 - Cody Cutrer
 - Ethan Vizitei
 - Jacob Burroughs
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,14 +192,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +410,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - cody@instructure.com
 - evizitei@instructure.com
@@ -504,7 +504,7 @@ homepage: https://github.com/instructure/inst-jobs
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -512,7 +512,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -520,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files: []