worker_killer 1.0.2.187805 → 1.0.2.187852

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d3c21030cbbe79605a447ab1c25907b0d75c826090650b03eb1899b98581c7b
-  data.tar.gz: c32c301433c80c608ca99961ef124fe4669f5db9cad1f07d5124c5b58234e3e1
+  metadata.gz: 0cde26e5d9705270605884443084f3dada5182e12ce9cba38c91ef5206837ced
+  data.tar.gz: 8ebe3a9edafa87bafb84edd1f52277bb62dc9db7484fa4f0515ec0acaaf5d9ac
 SHA512:
-  metadata.gz: c483c498cecdb6a0bb04cfd2bbb57d34a386d6398d3dc5d075aedc8cad63cf145f9b78833264a2bfd10d78bc588bbdf9400007d13cab03bf421e2b9d065b9d45
-  data.tar.gz: 60912f376e59463feaa46b34d88e1ac08d4810ad9388049dafd3f1acacb1da3deee720655a4dff63f85b00037badb9b4d2d8a33d2d3eb77a3cc8c48e8fea180f
+  metadata.gz: 8bb89c7851d4dd6a127fa33273ca6c64e899c1d03d7e44709435a940944e7dff074a2f56f794221790464836d174fbb2dfa02f1ee08cf333a4b05342c6b0e1d7
+  data.tar.gz: ca33356f8884b182c7ad06883b337168b563f105829f5f587471b87972d76b3738e97f5bb7e6cbcfe335d630cf386cb2026d805eb1ff1a264d60961ae5d27735

data/lib/worker_killer/count_limiter.rb

@@ -17,12 +17,12 @@ module WorkerKiller
       @started_at ||= Time.now
 
       if @verbose
-        logger.info "#{self}: worker (pid: #{Process.pid}) has #{@left} left before being limited"
+        logger.info "#{self.class}: worker (pid: #{Process.pid}) has #{@left} left before being limited"
       end
 
       return false if (@left -= 1) > 0
 
-      logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds max number of requests (limit: #{@limit})"
+      logger.warn "#{self.class}: worker (pid: #{Process.pid}) exceeds max number of requests (limit: #{@limit})"
 
       true
     end

data/lib/worker_killer/killer/delayed_job.rb

@@ -4,18 +4,18 @@ module WorkerKiller
 
       def do_kill(sig, pid, alive_sec, dj:, **_params)
         if sig == :KILL
-          logger.error "#{self} force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+          logger.error "#{self.class}: force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
           Process.kill sig, pid
           return
         end
 
         dj.stop
-        logger.info "#{self} try to stop DelayedJob due to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+        logger.info "#{self.class}: try to stop DelayedJob due to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
 
         return if sig != :TERM
 
         if @termination
-          logger.warn "#{self} force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+          logger.warn "#{self.class}: force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
           Process.kill sig, pid
         else
           @termination = true

data/lib/worker_killer/killer.rb

@@ -4,7 +4,7 @@ module WorkerKiller
 
       attr_accessor :config, :kill_attempts, :logger
 
-      def initialize(logger: WorkerKiller.configuration.logger, **_kwargs)
+      def initialize(logger: nil, **_kwargs)
         @logger = logger
         @config = WorkerKiller.configuration
         @kill_attempts = 0
@@ -27,6 +27,10 @@ module WorkerKiller
         raise 'Not Implemented'
       end
       # :nocov:
+      
+      def logger
+        @logger || WorkerKiller.configuration.logger
+      end
 
     end
   end

data/lib/worker_killer/memory_limiter.rb

@@ -24,13 +24,13 @@ module WorkerKiller
 
       rss = GetProcessMem.new.bytes
       if @verbose
-        logger.info "#{self}: worker (pid: #{Process.pid}) using #{rss} bytes(#{rss / 1024 / 1024}mb)."
+        logger.info "#{self.class}: worker (pid: #{Process.pid}) using #{rss} bytes(#{rss / 1024 / 1024}mb)."
       end
       @check_count = 0
 
       return false if rss <= @limit
 
-      logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss} bytes > #{@limit} bytes)"
+      logger.warn "#{self.class}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss} bytes > #{@limit} bytes)"
 
       true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worker_killer
 version: !ruby/object:Gem::Version
-  version: 1.0.2.187805
+  version: 1.0.2.187852
 platform: ruby
 authors:
 - Samoilenko Yuri
@@ -171,15 +171,15 @@ signing_key:
 specification_version: 4
 summary: Kill any workers by memory and request counts or take custom reaction
 test_files:
-- spec/killer/signal_spec.rb
-- spec/killer/delayed_job_spec.rb
-- spec/killer/passenger_spec.rb
-- spec/killer_spec.rb
-- spec/count_limiter_spec.rb
-- spec/worker_killer_spec.rb
-- spec/support/logger.rb
 - spec/middleware_spec.rb
+- spec/killer_spec.rb
 - spec/spec_helper.rb
 - spec/delayed_job_plugin/oom_limiter_spec.rb
 - spec/delayed_job_plugin/jobs_limiter_spec.rb
+- spec/killer/passenger_spec.rb
+- spec/killer/signal_spec.rb
+- spec/killer/delayed_job_spec.rb
 - spec/memory_limiter_spec.rb
+- spec/support/logger.rb
+- spec/worker_killer_spec.rb
+- spec/count_limiter_spec.rb