inst-jobs 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ab1bd6816331fee7e233542126f85236688fc647050bfc18a1b635e78cd34e5
-  data.tar.gz: 8b5a8e483f8052ed8a01b77a5a610d06bb9b4f3b59b253982d96c353a24fa113
+  metadata.gz: 35a651c7d168b0e569ebc47f13ed3500bd10d813308993ecdbfbc176e74943a5
+  data.tar.gz: eba8a2e50f5414684045bde99d5ccc1dc144d00f6b84d3bb82ec5c6becc34003
 SHA512:
-  metadata.gz: e1affab489a4655084667dee40a487964da7c50780e7124b15ed18b7319bad1db6606f11bde3e109feef9d09ed94c2fd7d70b5c8f0da049c6f3411f5d9d4bf67
-  data.tar.gz: eae5d0a5db108e6f0ed92567a466a1663a411fdeac386b159eba906d26f05bea199ef495c020f43ae10d03d6bf6efdfa198e8b39f46caf8d0fb7e8f2a7192704
+  metadata.gz: bc667a0ce1380f8acfe092bdf938d06e8d2dfff1018f53679930f88c8ffa45bf088e758fd362f99c5835600527f5a3d2cf189e7560dd6ecce57850d64682f178
+  data.tar.gz: 83d984683717018254316d891a972809bf7c3597628d94de149a4af0dab2efe5cf77473a6580408ec461c0d8dddc206b03e8747cbe6f22ba2f169194be876210

data/lib/delayed/backend/base.rb

@@ -56,6 +56,12 @@ module Delayed
           kwargs[:expires_at] = expires_at
           kwargs[:queue] = queue
 
+          strand_args = 0
+          strand_args += 1 if strand
+          strand_args += 1 if n_strand
+          strand_args += 1 if singleton
+          raise ArgumentError, "Only one of strand, n_strand, or singleton can be used" if strand_args > 1
+
           # If two parameters are given to n_strand, the first param is used
           # as the strand name for looking up the Setting, while the second
           # param is appended to make a unique set of strands.

data/lib/delayed/pool.rb

@@ -106,6 +106,7 @@ class Pool
   # db connections with the parent
   def fork_with_reconnects
     fork do
+      @self_pipe.each(&:close) # sub-processes don't need to wake us up; keep their FDs clean
       Pool.on_fork.()
       Delayed::Job.reconnect!
       yield

data/lib/delayed/settings.rb

@@ -84,7 +84,7 @@ module Delayed
     def self.worker_config(config_filename = nil)
       config_filename ||= default_worker_config_name
       config = YAML.load(ERB.new(File.read(config_filename)).result)
-      env = defined?(RAILS_ENV) ? RAILS_ENV : ENV['RAILS_ENV'] || 'development'
+      env = Rails.env || 'development'
       config = config[env] || config['default']
       # Backwards compatibility from when the config was just an array of queues
       config = { :workers => config } if config.is_a?(Array)

data/lib/delayed/version.rb

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

data/lib/delayed/work_queue/in_process.rb

@@ -16,6 +16,7 @@ class InProcess
   end
 
   # intentional nops for compatibility w/ parent process
+  def init; end
   def close; end
   def wake_up; end
 end

data/lib/delayed/work_queue/parent_process/client.rb

@@ -11,7 +11,10 @@ class ParentProcess
     def initialize(addrinfo, config: Settings.parent_process)
       @addrinfo = addrinfo
       @connect_timeout = config['client_connect_timeout'] || 2
-      @self_pipe = IO.pipe
+    end
+
+    def init
+      @self_pipe ||= IO.pipe
     end
 
     def close

data/lib/delayed/worker.rb

@@ -69,7 +69,6 @@ class Worker
     @config = options
     @job_count = 0
 
-    @self_pipe = IO.pipe
     @signal_queue = []
 
     app = Rails.application
@@ -120,6 +119,8 @@ class Worker
   def start
     logger.info "Starting worker"
     set_process_name("start:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}")
+    @self_pipe = IO.pipe
+    work_queue.init
 
     work_thread = Thread.current
     SIGNALS.each do |sig|
@@ -162,6 +163,9 @@ class Worker
       signal_processor.kill
       signal_processor.join
     end
+
+    @self_pipe&.each(&:close)
+    @self_pipe = nil
   end
 
   def cleanup!

data/spec/delayed/work_queue/parent_process/client_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::ParentProcess::Client do
-  let(:subject) { described_class.new(addrinfo) }
+  let(:subject) { described_class.new(addrinfo).tap(&:init) }
   let(:addrinfo) { double('Addrinfo') }
   let(:connection) { double('Socket') }
   let(:job) { Delayed::Job.new(locked_by: "worker_name") }

data/spec/gemfiles/60.gemfile.lock

@@ -0,0 +1,246 @@
+PATH
+  remote: ../..
+  specs:
+    inst-jobs (2.3.1)
+      activerecord (>= 5.2)
+      activesupport (>= 5.2)
+      after_transaction_commit (>= 1.0, < 3)
+      debug_inspector (~> 1.0)
+      fugit (~> 1.3)
+      railties (>= 5.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      actionview (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.3.7)
+      actionview (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.7)
+      activesupport (= 6.0.3.7)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.7)
+      activesupport (= 6.0.3.7)
+      globalid (>= 0.3.6)
+    activemodel (6.0.3.7)
+      activesupport (= 6.0.3.7)
+    activerecord (6.0.3.7)
+      activemodel (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+    activestorage (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      marcel (~> 1.0.0)
+    activesupport (6.0.3.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    after_transaction_commit (2.2.2)
+      activerecord (>= 5.2)
+    builder (3.2.4)
+    bump (0.10.0)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    debug_inspector (1.1.0)
+    deep_merge (1.2.1)
+    diff-lcs (1.4.4)
+    diplomat (2.5.1)
+      deep_merge (~> 1.2)
+      faraday (>= 0.9)
+    erubi (1.10.0)
+    et-orbi (1.2.4)
+      tzinfo
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    fugit (1.4.5)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.4)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    hashdiff (1.0.1)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    loofah (2.10.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.1)
+    method_source (1.0.0)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.7-x86_64-darwin)
+      racc (~> 1.4)
+    pg (1.2.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    raabro (1.4.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-protection (2.1.0)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.3.7)
+      actioncable (= 6.0.3.7)
+      actionmailbox (= 6.0.3.7)
+      actionmailer (= 6.0.3.7)
+      actionpack (= 6.0.3.7)
+      actiontext (= 6.0.3.7)
+      actionview (= 6.0.3.7)
+      activejob (= 6.0.3.7)
+      activemodel (= 6.0.3.7)
+      activerecord (= 6.0.3.7)
+      activestorage (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.7)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.7)
+      actionpack (= 6.0.3.7)
+      activesupport (= 6.0.3.7)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.3)
+    redis (4.2.5)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.1.0)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
+      tilt (~> 2.0)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    timecop (0.9.4)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    webmock (3.13.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    wwtd (1.4.1)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-darwin-20
+
+DEPENDENCIES
+  bump
+  byebug
+  database_cleaner (~> 2.0)
+  database_cleaner-active_record (~> 2.0)
+  diplomat (~> 2.5.1)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 6.0.0)
+  rake
+  rspec (~> 3.10)
+  sinatra (~> 2.0)
+  sinatra-contrib (~> 2.0)
+  timecop (= 0.9.4)
+  webmock
+  wwtd (~> 1.4.0)
+
+BUNDLED WITH
+   2.2.17

data/spec/shared/shared_backend.rb

@@ -313,6 +313,13 @@ shared_examples_for 'a backend' do
       expect(second).to eq nil
     end
 
+    it "complains if you pass more than one strand-based option" do
+      expect { create_job(strand: 'a', n_strand: 'b') }.to raise_error(ArgumentError)
+      expect { create_job(strand: 'a', singleton: 'b') }.to raise_error(ArgumentError)
+      expect { create_job(n_strand: 'a', singleton: 'b') }.to raise_error(ArgumentError)
+      expect { create_job(strand: 'a', n_strand: 'b', singleton: 'c') }.to raise_error(ArgumentError)
+    end
+
     context 'singleton' do
       it "should create if there's no jobs on the strand" do
         @job = create_job(:singleton => 'myjobs')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Tobias Luetke
 - Brian Palmer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -353,7 +353,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
-description:
+description: 
 email:
 - brianp@instructure.com
 executables:
@@ -452,6 +452,7 @@ files:
 - spec/delayed/worker_spec.rb
 - spec/gemfiles/52.gemfile
 - spec/gemfiles/60.gemfile
+- spec/gemfiles/60.gemfile.lock
 - spec/gemfiles/61.gemfile
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
@@ -467,7 +468,7 @@ files:
 homepage: https://github.com/instructure/inst-jobs
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -482,14 +483,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files:
 - spec/sample_jobs.rb
 - spec/spec_helper.rb
 - spec/redis_job_spec.rb
+- spec/gemfiles/60.gemfile.lock
 - spec/gemfiles/61.gemfile
 - spec/gemfiles/60.gemfile
 - spec/gemfiles/52.gemfile