worker_killer 1.0.1.83603 → 1.0.2.187732

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af1736e1bb8f2bfc3c3aa9e93d2fa1aa429173dc2389e7969c24210479e90441
-  data.tar.gz: f472d15158b29d0a920e49f873b46edcc19f554c0d3a75cfe33cf43b195ed0d6
+  metadata.gz: a0a5748a9d257aeacb4e2c486fc9272e7596a0eb1209c6e36c0bc28266677006
+  data.tar.gz: d64b7e01f1b29bfa09abd1766671c2bf6194a01de0534a5ee1dafb9c5075ca40
 SHA512:
-  metadata.gz: 2796b66e4f0069df66073c2acdc2cefa7c2213efdf36ddaf7a76e63cdc9bf53ffe4b369406bb8e6dd890d6f242b47f44fcd4cfde83e73b499f8d1e002097a8bd
-  data.tar.gz: a3d13754ae85c50564e8b825d61ec8d0397b1e664647e3b18a4423426f081b6a6bada3e26941773415856afa1e5abab8fdf04a88045beb2f2b704054f0d1517e
+  metadata.gz: bc1f156405493859b4cf0ddf1cc372eae5dee1ca861e761a4bfcba59bd41702e58edae47c1e813be460183258550b9c5b8cc00eb918c33157af2a57d91ad489d
+  data.tar.gz: aa97b6c4cae358769e76f70b553b842bcdf79457f63fefe97c5ec3dea27fa4f5797ba519991efd29a139a35b63baacd3fd861a7ca7fc37affa0a24ff038de97c

data/lib/worker_killer/delayed_job_plugin.rb

@@ -14,15 +14,22 @@ module WorkerKiller
       end
 
       @limiter = klass.new(**opts)
+      @time_to_burn = false
     end
 
-    def new(*_args)
-      configure_lifecycle(Delayed::Worker.lifecycle)
+    def new(lifecycle = Delayed::Worker.lifecycle, *_args)
+      configure_lifecycle(lifecycle)
     end
 
     def configure_lifecycle(lifecycle)
+      # Count condition after every job
       lifecycle.after(:perform) do |worker, *_args|
-        reaction.call(limiter, killer, worker) if limiter.check
+        @time_to_burn = limiter.check
+      end
+      
+      # Stop execution only after whole loop completed
+      lifecycle.after(:loop) do |worker, *_args|
+        reaction.call(limiter, killer, worker) if @time_to_burn
       end
     end
 

data/lib/worker_killer/version.rb

@@ -2,7 +2,7 @@
 
 module WorkerKiller
 
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
 end
 

data/spec/delayed_job_plugin/jobs_limiter_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe WorkerKiller::DelayedJobPlugin::JobsLimiter do
+
+  let(:killer) {double}
+  subject(:plugin){ described_class.new(killer: killer) }
+
+  context 'DelayedJob initialization' do
+    let(:lifecycle) { double }
+    subject(:instance) { plugin.new(lifecycle) }
+    
+    it  do
+      expect(lifecycle).to receive(:after).with(:perform).and_yield
+      expect(lifecycle).to receive(:after).with(:loop).and_yield
+      instance
+    end
+  end
+end
+

data/spec/delayed_job_plugin/oom_limiter_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe WorkerKiller::DelayedJobPlugin::OOMLimiter do
+
+  let(:killer) {double}
+  subject(:plugin){ described_class.new(killer: killer) }
+
+  context 'DelayedJob initialization' do
+    let(:lifecycle) { double }
+    subject(:instance) { plugin.new(lifecycle) }
+    
+    it  do
+      expect(lifecycle).to receive(:after).with(:perform).and_yield
+      expect(lifecycle).to receive(:after).with(:loop).and_yield
+      instance
+    end
+  end
+end
+

data/spec/killer/delayed_job_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe WorkerKiller::Killer::DelayedJob do
     end
   end
 
-  let(:killer){ described_class.new() }
   let(:dj){ double }
+  subject(:killer){ described_class.new() }
 
   describe '#kill' do
     context 'with use_quit TRUE' do
@@ -30,5 +30,6 @@ RSpec.describe WorkerKiller::Killer::DelayedJob do
       end
     end
   end
+  
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker_killer
 version: !ruby/object:Gem::Version
-  version: 1.0.1.83603
+  version: 1.0.2.187732
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2023-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem
@@ -136,6 +136,8 @@ files:
 - lib/worker_killer/middleware.rb
 - lib/worker_killer/version.rb
 - spec/count_limiter_spec.rb
+- spec/delayed_job_plugin/jobs_limiter_spec.rb
+- spec/delayed_job_plugin/oom_limiter_spec.rb
 - spec/killer/delayed_job_spec.rb
 - spec/killer/passenger_spec.rb
 - spec/killer/signal_spec.rb
@@ -178,4 +180,6 @@ test_files:
 - spec/support/logger.rb
 - spec/middleware_spec.rb
 - spec/spec_helper.rb
+- spec/delayed_job_plugin/oom_limiter_spec.rb
+- spec/delayed_job_plugin/jobs_limiter_spec.rb
 - spec/memory_limiter_spec.rb