inst-jobs 0.13.5 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6fbdeb269f4f69f782600a64e9f98eeb7c788b
-  data.tar.gz: ada970af5b83314a5c242c826f880af2808a16e7
+  metadata.gz: b63744bcf8a08c33dca7774529b4a20fb919771d
+  data.tar.gz: 4c5a5a634d64817e7ac47bc01182228d2b0a3c93
 SHA512:
-  metadata.gz: c802d32a04ee4c5fc7c3000d0da1a16b4ac1f6badafa96b5163cf9683d02d777398504fd2b8e3649ce0313397e12c4e08aabedf21a41c58c0fdcd77af8b85a1c
-  data.tar.gz: bab3104244bfd19656440c748e17be05ecbde32064f92d600798475a78661e3c066f289f25fcb7ecab661e4a09ccaa343348dffe0e40ce9dd82e9a5a9135e5b4
+  metadata.gz: 217273201d1fd055e55c711e52d101051afd404b1b6dc75443901b4add9b03433e2c8e50bbaaa4d162defd321b7da911c5fafc9ba25fb2ac6541983f6070ec4e
+  data.tar.gz: 76ad540b9e89b1c5e60265cb4c5aa18c463eb51810f4c965546da578005759ba09bfdeb429e92b8dd7b1d4aedab117489ba4a3c84e4fb24f1bbbfb8a1abf1b4e

data/lib/delayed/cli.rb

@@ -2,7 +2,15 @@ require 'optparse'
 
 module Delayed
 class CLI
+  class << self
+    attr_accessor :instance
+  end
+
+  attr_reader :config
+
   def initialize(args = ARGV)
+    self.class.instance = self
+
     @args = args
     # config that will be applied on Settings and passed to the created Pool
     @config = {}

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.13.5"
+  VERSION = "0.13.6"
 end

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

@@ -122,6 +122,8 @@ class ParentProcess
         next if workers.empty?
 
         logger.debug("Fetching new work for #{workers.length} workers")
+        jobs_to_send = []
+
         Delayed::Worker.lifecycle.run_callbacks(:work_queue_pop, self, worker_config) do
           recipients = workers.map(&:name)
 
@@ -142,15 +144,19 @@ class ParentProcess
             end
             client = workers.find { |worker| worker.name == worker_name }
             client.working = true
-            @waiting_clients[worker_config].delete(client)
-            begin
-              logger.debug("Sending job #{job.id} to #{client.name}")
-              client_timeout { Marshal.dump(job, client.socket) }
-            rescue SystemCallError, IOError, Timeout::Error => ex
-              logger.error("Failed to send job to #{client.name}: #{ex.inspect}")
-              drop_socket(client.socket)
-              Delayed::Job.unlock([job])
-            end
+            jobs_to_send << [client, job]
+          end
+        end
+
+        jobs_to_send.each do |(client, job)|
+          @waiting_clients[worker_config].delete(client)
+          begin
+            logger.debug("Sending job #{job.id} to #{client.name}")
+            client_timeout { Marshal.dump(job, client.socket) }
+          rescue SystemCallError, IOError, Timeout::Error => ex
+            logger.error("Failed to send job to #{client.name}: #{ex.inspect}")
+            drop_socket(client.socket)
+            Delayed::Job.unlock([job])
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.13.6
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit