delayed_job_heartbeat_plugin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23c84e35c7097a52dd7c4ff8431ec634adc72b4
-  data.tar.gz: 626b0561368160ea52dd2b7d4cf65240768cd3c7
+  metadata.gz: cef7ae61852d4de36ca9f5cc1059a576dea01abe
+  data.tar.gz: 5f3d3eea13aff2b10d4deddfb2e366c45e0ded48
 SHA512:
-  metadata.gz: fa8a6ff6c94fef094132d2625eb534a2f9b68730fae7696e57001ea513aa28ec7966bfff1b8c9f3e41ac10209ee817c3f495e5288aa4c445999def8c83fa2692
-  data.tar.gz: 5a13041ce00bf26a2dfccd022831f32c1273587e701c9e759423519ae3bbaf4ffe35677bb11ff4c81f2d9bfc6e66114d37bb979d22c33d322a393e03a7b46156
+  metadata.gz: 114f547ef885c5cf30fbc00b0402c0aed425439620549ffdadd96db5443390ec8abd881d686405ed5e2107260ae1a57e9dfb6673a31dcd721122dddb565ec3c8
+  data.tar.gz: 695f793b5732247503f4795057ee59ec0df1ac68d5fd24ebd8206b504e8d37c74d2a1a0ebc566ffdcbcabddb195c82ea1cf53277b9826b172b42ea8ee7ff1175

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# Changelog
+
+### 0.2.0 (unreleased)
+* Enable correlation between workers and unlocked jobs in results returned from deleting workers

data/lib/delayed/heartbeat.rb

@@ -34,11 +34,11 @@ module Delayed
 
       def cleanup_workers(workers, mark_attempt_failed: true)
         Delayed::Heartbeat::Worker.transaction do
-          orphaned_jobs = workers.flat_map do |worker|
-            worker.unlock_jobs(mark_attempt_failed: mark_attempt_failed)
+          worker_job_map = workers.each_with_object(Hash.new) do |worker, worker_job_map|
+            worker_job_map[worker] = worker.unlock_jobs(mark_attempt_failed: mark_attempt_failed)
           end
           Delayed::Heartbeat::Worker.delete_workers(workers)
-          Delayed::Heartbeat::DeleteWorkerResults.new(workers, orphaned_jobs)
+          Delayed::Heartbeat::DeleteWorkerResults.new(worker_job_map)
         end
       end
     end

data/lib/delayed/heartbeat/delete_worker_results.rb

@@ -1,42 +1,32 @@
 module Delayed
   module Heartbeat
     class DeleteWorkerResults
-      attr_reader :workers, :unlocked_jobs
+      def initialize(worker_job_map)
+        @worker_job_map = worker_job_map
+      end
+
+      def workers
+        @worker_job_map.keys
+      end
 
-      def initialize(workers, unlocked_jobs)
-        @workers = workers
-        @unlocked_jobs = unlocked_jobs
+      def unlocked_jobs(worker = nil)
+        worker ? @worker_job_map.fetch(worker, []) : @worker_job_map.values.flatten
       end
 
       def empty?
-        workers.empty? && unlocked_jobs.empty?
+        @worker_job_map.empty?
       end
 
       def to_s
         io = StringIO.new
         workers.each do |worker|
-          io.puts("Deleted worker #{worker_description(worker)}")
-        end
-
-        unlocked_jobs.each do |unlocked_job|
-          worker = worker_map[unlocked_job.locked_by]
-          worker_string = worker ? worker_description(worker) : unlocked_job.locked_by
-          io.puts("Unlocked orphaned job #{unlocked_job.id} from worker #{worker_string}")
-        end
-
-        io.string
-      end
-
-      private
-
-      def worker_map
-        @worker_map ||= workers.each_with_object(Hash.new) do |worker, worker_map|
-          worker_map[worker.name] = worker
+          worker_description = "#{worker.label}(#{worker.name})"
+          io.puts("Deleted worker #{worker_description}")
+          unlocked_jobs(worker).each do |unlocked_job|
+            io.puts("Unlocked orphaned job #{unlocked_job.id} from worker #{worker_description}")
+          end
         end
-      end
-
-      def worker_description(worker)
-        "#{worker.label}(#{worker.name})"
+        io.string.rstrip
       end
     end
   end

data/lib/delayed/heartbeat/version.rb

@@ -2,6 +2,6 @@
 
 module Delayed
   module Heartbeat
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/spec/delayed/heartbeat/delete_worker_results_spec.rb

@@ -3,32 +3,29 @@ require 'spec_helper'
 describe Delayed::Heartbeat::DeleteWorkerResults do
   let(:worker) { create_worker(name: 'my-worker') }
   let(:job) { create_job(locked_by: worker.name) }
-  let(:results) { create_results([worker], [job]) }
+  let(:results) { create_results(worker => [job]) }
 
   describe "#workers" do
     specify { expect(results.workers).to eq [worker] }
   end
 
   describe "#unlocked_jobs" do
-    specify { expect(results.unlocked_jobs).to eq [job] }
+    let(:other_worker) { create_worker(name: 'my-other-worker') }
+    let(:other_job) { create_job(locked_by: worker.name) }
+    let(:results) { create_results(worker => [job], other_worker => [other_job]) }
+
+    specify { expect(results.unlocked_jobs(worker)).to eq [job] }
+    specify { expect(results.unlocked_jobs).to match_array [job, other_job] }
   end
 
   describe "#to_s" do
     it "includes workers" do
-      results = create_results([worker], [])
+      results = create_results(worker => [])
       expect(results.to_s).to include(worker.name)
     end
 
-    it "includes jobs for known workers" do
-      results = create_results([worker], [job])
-      expect(results.to_s).to include(job.id.to_s)
-    end
-
-    it "includes jobs locked by an unknown worker" do
-      job = create_job(locked_by: 'unknown-worker')
-      results = create_results([], [job])
+    it "includes jobs for workers" do
       expect(results.to_s).to include(job.id.to_s)
-      expect(results.to_s).to include(job.locked_by)
     end
   end
 
@@ -41,7 +38,7 @@ describe Delayed::Heartbeat::DeleteWorkerResults do
     Delayed::Job.create!(attributes)
   end
 
-  def create_results(workers, unlocked_jobs)
-    Delayed::Heartbeat::DeleteWorkerResults.new(workers, unlocked_jobs)
+  def create_results(worker_job_map)
+    Delayed::Heartbeat::DeleteWorkerResults.new(worker_job_map)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_heartbeat_plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joel Turkel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -166,6 +166,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md