worker_killer 1.0.1.75538 → 1.0.2.187732

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c6211b790da17ea0b47bad73ee9689a2b5b77e1a5154f9463d9edce4e0afc55
-  data.tar.gz: 2934e7d52ee80eb1ccf87478666bc57b91c869d042f593f63763287bf1a88c7f
+  metadata.gz: a0a5748a9d257aeacb4e2c486fc9272e7596a0eb1209c6e36c0bc28266677006
+  data.tar.gz: d64b7e01f1b29bfa09abd1766671c2bf6194a01de0534a5ee1dafb9c5075ca40
 SHA512:
-  metadata.gz: 4f64d4a287ec283d6f5adb1411b7bffc6272765c27e7120030597e056a825766bcbbe37746a5c9bd4d4c3e6b0392a6d72ab1984a56f6b6c9b0fbf35683dd2430
-  data.tar.gz: 8ca469adb753f2e49936eecc8d6b893369921d644af6e04c14a4fdcf908b04ba515c2860f2b8ab10c4e3aae5c003e3fd75a3c5586b7e15a797b885da0fd4ff4f
+  metadata.gz: bc1f156405493859b4cf0ddf1cc372eae5dee1ca861e761a4bfcba59bd41702e58edae47c1e813be460183258550b9c5b8cc00eb918c33157af2a57d91ad489d
+  data.tar.gz: aa97b6c4cae358769e76f70b553b842bcdf79457f63fefe97c5ec3dea27fa4f5797ba519991efd29a139a35b63baacd3fd861a7ca7fc37affa0a24ff038de97c

data/lib/worker_killer/delayed_job_plugin.rb

@@ -13,16 +13,23 @@ module WorkerKiller
         k.kill(l.started_at, dj: dj)
       end
 
-      @limiter = klass.new(opts)
+      @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/count_limiter_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe WorkerKiller::CountLimiter do
-  subject{ described_class.new(options) }
+  subject{ described_class.new(**options) }
   let(:min){ rand(50..100) }
   let(:max){ min + rand(100) }
   let(:options){ { min: min, max: max, verbose: true } }

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
 

data/spec/killer_spec.rb

@@ -19,9 +19,15 @@ RSpec.describe WorkerKiller::Killer::Base do
       end
 
       it 'expect right signal order' do
-        expect(killer).to receive(:do_kill).with(:QUIT, anything, anything, anything).exactly(2).times
-        expect(killer).to receive(:do_kill).with(:TERM, anything, anything, anything).exactly(2).times
-        expect(killer).to receive(:do_kill).with(:KILL, anything, anything, anything).exactly(5).times
+        if RUBY_VERSION >= "3.0.0"
+          expect(killer).to receive(:do_kill).with(:QUIT, anything, anything).exactly(2).times
+          expect(killer).to receive(:do_kill).with(:TERM, anything, anything).exactly(2).times
+          expect(killer).to receive(:do_kill).with(:KILL, anything, anything).exactly(5).times
+        else
+          expect(killer).to receive(:do_kill).with(:QUIT, anything, anything, anything).exactly(2).times
+          expect(killer).to receive(:do_kill).with(:TERM, anything, anything, anything).exactly(2).times
+          expect(killer).to receive(:do_kill).with(:KILL, anything, anything, anything).exactly(5).times
+        end
 
         2.times { killer.kill(Time.now) } # 2 QUIT
         2.times { killer.kill(Time.now) } # 2 TERM

data/spec/memory_limiter_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe WorkerKiller::MemoryLimiter do
   let(:logger){ Logger.new(nil) }
 
-  subject{ described_class.new(options) }
+  subject{ described_class.new(**options) }
   let(:mb){ 1024 * 1024 }
   let(:min){ rand(50..100) * mb }
   let(:max){ min + rand(100) * mb }

data/spec/middleware_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe WorkerKiller::Middleware do
   describe 'Custom class' do
     let(:klass){ double }
     let(:options){ { killer: killer, klass: klass, reaction: reaction, anykey: anykey } }
-    subject{ described_class.new(app, options) }
+    subject{ described_class.new(app, **options) }
 
     it 'is expected to be initialized' do
       expect(klass).to receive(:new).with(anykey: anykey).and_return(99)
@@ -20,7 +20,7 @@ RSpec.describe WorkerKiller::Middleware do
 
   describe WorkerKiller::Middleware::RequestsLimiter do
     let(:options){ { killer: killer, min: 3, max: 3 } }
-    subject{ described_class.new(app, options) }
+    subject{ described_class.new(app, **options) }
 
     it 'is expected to be initialized without reaction' do
       expect(WorkerKiller::CountLimiter).to receive(:new).with(min: 3, max: 3).and_call_original
@@ -51,7 +51,7 @@ RSpec.describe WorkerKiller::Middleware do
 
   describe WorkerKiller::Middleware::OOMLimiter do
     let(:options){ { killer: killer, min: 2222, max: 2223 } }
-    subject{ described_class.new(app, options) }
+    subject{ described_class.new(app, **options) }
 
     it 'is expected to be initialized without reaction' do
       expect(WorkerKiller::MemoryLimiter).to receive(:new).with(min: 2222, max: 2223).and_call_original

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker_killer
 version: !ruby/object:Gem::Version
-  version: 1.0.1.75538
+  version: 1.0.2.187732
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 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