sidekiq-redeploy 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44da7799d2f98c9fc8166cc3d91ed8dacfec65eff5e3d6e49a0ed401ead3324b
-  data.tar.gz: 537e810b1770b49fd139f87fe2fdde258ab7c8b413eb2ca5d56eb7106e6e181f
+  metadata.gz: 49eb0b9481aa541611a9b46422e678d965156dbd892f72f8b381d0675523abf8
+  data.tar.gz: 828aca4be4760f584ae5fdc78bfeda3e8071dcdf34d2eba031dff052a40333a7
 SHA512:
-  metadata.gz: 27ac2ffb08b66b55b5d369abde5b4258f4e950aaf7b4715735cc256199134b61fb5e2eda0f3c9d2951be71a35f3cdd157eb2ca8559c2cd3513dc473d4b66b825
-  data.tar.gz: 520e4572ec108a7f5af82c517cd48586abd19c0ee39fd9046323ae869e3dd4161133b6eb911bc1b5b92db4c9d9e6b6215924d2d132d23c788a82cb6303c5348d
+  metadata.gz: b10b24436213050537dfd25e4ff823e5893f011940059ba3c1659c1f5f9c143d5a699e0678feb2fbeca5c92ba3435172dd15826fc07f50d927bb0bf7a511efef
+  data.tar.gz: 20ea11e09f85c2e16939f26f68cd16c7c667e591270334f640d067b746c5bb941079f586966c2ffe4ac476d2299a2a905a145e1bf6ae6755ce53de999c94b8d1

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+
+## v0.1.6
+
+**Fixes and enhancements:**
+
+- Remove unneeded logging
+
+## v0.1.5
+
+**Fixes and enhancements:**
+
+- Fix Process namespace collision with Sidekiq::Process
+
 ## v0.1.4
 
 **Fixes and enhancements:**

data/lib/sidekiq/redeploy/loader.rb

@@ -20,7 +20,7 @@ module Sidekiq
 
         @reload_sidekiq = false
         @exit_loader = false
-        @loader_pid = Process.pid
+        @loader_pid = ::Process.pid
         @logger = logger
         @signal_delay = config[:signal_delay] || 1
         @watch_delay = config[:watch_delay] || 30
@@ -40,14 +40,14 @@ module Sidekiq
         process_loop
 
         log 'Waiting for Sidekiq process to end'
-        Process.waitall
+        ::Process.waitall
 
         log 'Shutting down sidekiq reloader'
       rescue StandardError => e
         log "Error in sidekiq loader: #{e.message}"
         log e.backtrace.join("\n")
         stop_sidekiq(@sidekiq_pid)
-        Process.waitall
+        ::Process.waitall
         exit 1
       end
 
@@ -76,7 +76,6 @@ module Sidekiq
         return false unless (Time.now - @watch_time) > @watch_delay
 
         @watch_time = Time.now
-        log 'Checking watch file for redeploy'
         deployer.needs_redeploy?
       end
 
@@ -88,14 +87,14 @@ module Sidekiq
         stop_sidekiq(@sidekiq_pid)
 
         # wait for sidekiq to stop
-        Process.waitall
+        ::Process.waitall
 
         fork_sidekiq
         @reload_sidekiq = false
       end
 
       def fork_sidekiq
-        @sidekiq_pid = Process.fork do
+        @sidekiq_pid = ::Process.fork do
           cli = Sidekiq::CLI.instance
           args = @sidekiq_app ? ['-r', @sidekiq_app] : []
           cli.parse(args)
@@ -121,36 +120,36 @@ module Sidekiq
       def handle_signal(signal)
         debug_handler(signal)
         # Our handle_signal gets called for child processes (i.e. sidekiq process) so we don't want to re-handle these.
-        return if @loader_pid != Process.pid
+        return if @loader_pid != ::Process.pid
 
         case signal
         when USR2
           @reload_sidekiq = true
         when TTIN
-          Process.kill(signal, @sidekiq_pid)
+          ::Process.kill(signal, @sidekiq_pid)
         when TERM, INT
           @exit_loader = true
         end
       end
 
       def debug_handler(signal)
-        log_data = { signal:, current_pid: Process.pid, loader_pid: @loader_pid, sidekiq_pid: @sidekiq_pid,
+        log_data = { signal:, current_pid: ::Process.pid, loader_pid: @loader_pid, sidekiq_pid: @sidekiq_pid,
                      reload_sidekiq: @reload_sidekiq, exit_loader: @exit_loader }
         puts "handle_signal called with #{log_data}"
       end
 
       def stop_sidekiq(pid)
-        Process.kill(TERM, pid) if pid
+        ::Process.kill(TERM, pid) if pid
       end
 
       def quiet_sidekiq(pid)
-        Process.kill(TSTP, pid) if pid
+        ::Process.kill(TSTP, pid) if pid
       end
 
       def process_died?(pid)
         return false if @exit_loader
 
-        !Process.getpgid(pid)
+        !::Process.getpgid(pid)
       rescue StandardError
         true
       end

data/lib/sidekiq/redeploy/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Redeploy
-    VERSION = '0.1.4'
+    VERSION = '0.1.6'
   end
 end

data/sidekiq-redeploy.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'puma-redeploy', '~> 0.3.1'
+  spec.add_dependency 'puma-redeploy', '~> 0.3.2'
   spec.add_dependency 'sidekiq', '~> 6.0'
 
   spec.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-redeploy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - tbeauvais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma-redeploy
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement