inst-jobs 0.12.3 → 0.13.0

data/spec/delayed/work_queue/parent_process_spec.rb

@@ -1,22 +1,48 @@
 require 'spec_helper'
+require 'fileutils'
 
 RSpec.describe Delayed::WorkQueue::ParentProcess do
   before :all do
+    FileUtils.mkdir_p(Delayed::Settings.expand_rails_path('tmp'))
     Delayed.select_backend(Delayed::Backend::ActiveRecord::Job)
+    Delayed::Settings.parent_process = {
+      'server_address' => '/tmp/inst-jobs-test.sock'
+    }
   end
 
   after :all do
     Delayed.send(:remove_const, :Job)
+    Delayed::Settings.parent_process = {}
   end
 
   after :each do
+    File.unlink('/tmp/inst-jobs-test.sock') if File.exist?('/tmp/inst-jobs-test.sock')
     Delayed::Worker.lifecycle.reset!
   end
 
   let(:subject) { described_class.new }
-  let(:worker_config) { { queue: "queue_name", min_priority: 1, max_priority: 2 } }
-  let(:args) { ["worker_name", worker_config] }
-  let(:job_args) { [["worker_name"], "queue_name", 1, 2] }
+
+  describe '#initalize(config = Settings.parent_process)' do
+    it 'must expand a relative path to be within the Rails root' do
+      queue = described_class.new('server_address' => 'tmp/foo.sock')
+      expect(queue.server_address).to eq Delayed::Settings.expand_rails_path('tmp/foo.sock')
+    end
+
+    it 'must add a file name when a relative path to a directory is supplied' do
+      queue = described_class.new('server_address' => 'tmp')
+      expect(queue.server_address).to eq Delayed::Settings.expand_rails_path('tmp/inst-jobs.sock')
+    end
+
+    it 'must capture a full absolute path' do
+      queue = described_class.new('server_address' => '/tmp/foo.sock')
+      expect(queue.server_address).to eq '/tmp/foo.sock'
+    end
+
+    it 'must add a file name when an absolute path to a directory is supplied' do
+      queue = described_class.new('server_address' => '/tmp')
+      expect(queue.server_address).to eq '/tmp/inst-jobs.sock'
+    end
+  end
 
   it 'generates a server listening on a valid unix socket' do
     server = subject.server
@@ -32,165 +58,4 @@ RSpec.describe Delayed::WorkQueue::ParentProcess do
     expect(client.addrinfo.unix?).to be(true)
     expect(client.addrinfo.unix_path).to eq(server.listen_socket.local_address.unix_path)
   end
-
-  describe Delayed::WorkQueue::ParentProcess::Client do
-    let(:subject) { described_class.new(addrinfo) }
-    let(:addrinfo) { double('Addrinfo') }
-    let(:connection) { double('Socket') }
-    let(:job) { Delayed::Job.new(locked_by: "worker_name") }
-
-    it 'marshals the given arguments to the server and returns the response' do
-      expect(addrinfo).to receive(:connect).once.and_return(connection)
-      expect(Marshal).to receive(:dump).with(args, connection).ordered
-      expect(Marshal).to receive(:load).with(connection).and_return(job).ordered
-      response = subject.get_and_lock_next_available(*args)
-      expect(response).to eq(job)
-    end
-
-    it 'returns nil and then reconnects on socket error' do
-      expect(addrinfo).to receive(:connect).once.and_return(connection)
-      expect(Marshal).to receive(:dump).and_raise(SystemCallError.new("failure"))
-      response = subject.get_and_lock_next_available(*args)
-      expect(response).to be_nil
-
-      expect(addrinfo).to receive(:connect).once.and_return(connection)
-      expect(Marshal).to receive(:dump).with(args, connection)
-      expect(Marshal).to receive(:load).with(connection).and_return(job)
-      response = subject.get_and_lock_next_available(*args)
-      expect(response).to eq(job)
-    end
-
-    it 'errors if the response is not a locked job' do
-      expect(addrinfo).to receive(:connect).once.and_return(connection)
-      expect(Marshal).to receive(:dump).with(args, connection)
-      expect(Marshal).to receive(:load).with(connection).and_return(:not_a_job)
-      expect { subject.get_and_lock_next_available(*args) }.to raise_error(Delayed::WorkQueue::ParentProcess::ProtocolError)
-    end
-
-    it 'errors if the response is a job not locked by this worker' do
-      expect(addrinfo).to receive(:connect).once.and_return(connection)
-      expect(Marshal).to receive(:dump).with(args, connection)
-      job.locked_by = "somebody_else"
-      expect(Marshal).to receive(:load).with(connection).and_return(job)
-      expect { subject.get_and_lock_next_available(*args) }.to raise_error(Delayed::WorkQueue::ParentProcess::ProtocolError)
-    end
-  end
-
-  describe Delayed::WorkQueue::ParentProcess::Server do
-    let(:subject) { described_class.new(listen_socket) }
-    let(:listen_socket) { Socket.unix_server_socket(Delayed::WorkQueue::ParentProcess.generate_socket_path) }
-    let(:job) { :a_job }
-
-    it 'accepts new clients' do
-      client = Socket.unix(subject.listen_socket.local_address.unix_path)
-      expect { subject.run_once }.to change(subject, :connected_clients).by(1)
-    end
-
-    it 'queries the queue on client request' do
-      client = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-
-      expect(Delayed::Job).to receive(:get_and_lock_next_available).with(*job_args).and_return('worker_name' => job)
-      Marshal.dump(args, client)
-      subject.run_once
-      expect(client).to be_ready
-      expect(Marshal.load(client)).to eq(job)
-    end
-
-    it 'can pop multiple jobs at once' do
-      client1 = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-      client2 = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-
-      job_args = [["worker_name1", "worker_name2"], "queue_name", 1, 2]
-      jobs = { 'worker_name1' => :job1, 'worker_name2' => :job2 }
-
-      expect(Delayed::Job).to receive(:get_and_lock_next_available).with(*job_args).and_return(jobs)
-      Marshal.dump(["worker_name1", worker_config], client1)
-      Marshal.dump(["worker_name2", worker_config], client2)
-      subject.run_once
-      expect(Marshal.load(client1)).to eq(:job1)
-      expect(Marshal.load(client2)).to eq(:job2)
-    end
-
-    it "doesn't respond immediately if there are no jobs available" do
-      client = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-
-      expect(Delayed::Job).to receive(:get_and_lock_next_available).with(*job_args).and_return({}).ordered
-      Marshal.dump(args, client)
-      subject.run_once
-      expect(client).not_to be_ready
-
-      # next time around, return the result
-      expect(Delayed::Job).to receive(:get_and_lock_next_available).with(*job_args).and_return('worker_name' => job).ordered
-      allow(Delayed::Settings).to receive(:sleep_delay).and_return(0)
-      allow(Delayed::Settings).to receive(:sleep_delay_stagger).and_return(0)
-      subject.run_once
-      expect(client).to be_ready
-      expect(Marshal.load(client)).to eq(job)
-    end
-
-    it 'drops the client on i/o error' do
-      client = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-
-      Marshal.dump(args, client)
-
-      expect(Marshal).to receive(:load).and_raise(IOError.new("socket went away"))
-      expect { subject.run_once }.to change(subject, :connected_clients).by(-1)
-    end
-
-    it 'drops the client on timeout' do
-      client = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-
-      Marshal.dump(args, client)
-
-      expect(Marshal).to receive(:load).and_raise(Timeout::Error.new("socket timed out"))
-      expect(Timeout).to receive(:timeout).with(Delayed::Settings.parent_process_client_timeout).and_yield
-      expect { subject.run_once }.to change(subject, :connected_clients).by(-1)
-    end
-
-    it 'tracks when clients are idle' do
-      expect(subject.all_workers_idle?).to be(true)
-
-      client = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-      expect(subject.all_workers_idle?).to be(true)
-
-      expect(Delayed::Job).to receive(:get_and_lock_next_available).with(*job_args).and_return('worker_name' => job)
-      Marshal.dump(args, client)
-      subject.run_once
-      expect(subject.all_workers_idle?).to be(false)
-
-      expect(Delayed::Job).to receive(:get_and_lock_next_available).with(*job_args).and_return({})
-      Marshal.dump(args, client)
-      subject.run_once
-      expect(subject.all_workers_idle?).to be(true)
-    end
-
-    it 'triggers the lifecycle event around the pop' do
-      called = false
-      client = Socket.unix(subject.listen_socket.local_address.unix_path)
-      subject.run_once
-
-      Delayed::Worker.lifecycle.around(:work_queue_pop) do |queue, &cb|
-        expect(subject.all_workers_idle?).to be(true)
-        expect(queue).to eq(subject)
-        expect(Delayed::Job).to receive(:get_and_lock_next_available).with(*job_args).and_return('worker_name' => job)
-        called = true
-        res = cb.call(queue)
-        expect(subject.all_workers_idle?).to be(false)
-        res
-      end
-
-      Marshal.dump(args, client)
-      subject.run_once
-
-      expect(Marshal.load(client)).to eq(job)
-      expect(called).to eq(true)
-    end
-  end
 end

data/spec/gemfiles/42.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (0.12.2)
+    inst-jobs (0.12.3)
       after_transaction_commit (~> 1.0)
       rails (>= 4.2)
       redis (> 3.0)
@@ -11,57 +11,55 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     after_transaction_commit (1.1.1)
       activerecord (>= 4.0)
     arel (6.0.4)
-    backports (3.6.8)
+    backports (3.7.0)
     builder (3.2.3)
     bump (0.5.3)
     byebug (9.0.6)
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     database_cleaner (1.3.0)
     diff-lcs (1.3)
     erubis (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.6)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -73,9 +71,9 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     multi_json (1.12.1)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-    pg (0.19.0)
+    pg (0.20.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -85,16 +83,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
+      railties (= 4.2.8)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -104,9 +102,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
@@ -126,9 +124,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rufus-scheduler (3.3.3)
+    rufus-scheduler (3.3.4)
       tzinfo
-    sinatra (1.4.7)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
@@ -150,10 +148,10 @@ GEM
     test_after_commit (0.4.1)
       activerecord (>= 3.2)
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
     timecop (0.7.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     wwtd (1.3.0)
 
@@ -178,4 +176,4 @@ DEPENDENCIES
   wwtd (~> 1.3.0)
 
 BUNDLED WITH
-   1.14.3
+   1.14.6

data/spec/gemfiles/50.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (0.12.2)
+    inst-jobs (0.12.3)
       after_transaction_commit (~> 1.0)
       rails (>= 4.2)
       redis (> 3.0)
@@ -11,39 +11,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.1)
-      actionpack (= 5.0.1)
-      nio4r (~> 1.2)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activesupport (5.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -51,18 +51,18 @@ GEM
     after_transaction_commit (1.1.1)
       activerecord (>= 4.0)
     arel (7.1.4)
-    backports (3.6.8)
+    backports (3.7.0)
     builder (3.2.3)
     bump (0.5.3)
     byebug (9.0.6)
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     database_cleaner (1.3.0)
     diff-lcs (1.3)
     erubis (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -75,10 +75,10 @@ GEM
     minitest (5.10.1)
     multi_json (1.12.1)
     mustermann (1.0.0.beta2)
-    nio4r (1.2.1)
-    nokogiri (1.7.0.1)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-    pg (0.19.0)
+    pg (0.20.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -88,26 +88,26 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.1)
-      actioncable (= 5.0.1)
-      actionmailer (= 5.0.1)
-      actionpack (= 5.0.1)
-      actionview (= 5.0.1)
-      activejob (= 5.0.1)
-      activemodel (= 5.0.1)
-      activerecord (= 5.0.1)
-      activesupport (= 5.0.1)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.1)
+      railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -128,7 +128,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rufus-scheduler (3.3.3)
+    rufus-scheduler (3.3.4)
       tzinfo
     sinatra (2.0.0.beta2)
       mustermann (= 1.0.0.beta2)
@@ -154,10 +154,10 @@ GEM
     test_after_commit (0.4.1)
       activerecord (>= 3.2)
     thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
     timecop (0.7.1)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
@@ -185,4 +185,4 @@ DEPENDENCIES
   wwtd (~> 1.3.0)
 
 BUNDLED WITH
-   1.14.3
+   1.14.6