sidekiq-redeploy 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d105384fd7ef69a92ab40d8b9d1f68dda9caf93e81408b9ee810b103e49ba146
-  data.tar.gz: cf879748d242a491aa7d9183e592dd05b6504766fc9ab0c6a6c7f3d4caf94770
+  metadata.gz: f8056e7c8b67a8b90cd8482050e68229bb36ef9c9097e61d625dc786ef76e208
+  data.tar.gz: 6f12abb37fbaf995583c9ecf3620178b03ff94b90678a2acb747fdf393457d77
 SHA512:
-  metadata.gz: 6f4abfe5fea9491e1c7c89d7b07b01a6d8cf0871cf381b86ce1cf6b75ae48331b21da9c3442564e1696e3d5b2664744ed5d0e2f1128ed3b42776a6e1cd6ffe88
-  data.tar.gz: 02c405793d6197e95401e4324968bd15af4410634e9be6df91a3fc30a9d278837e3e1795fd6f74af21c7e85b000eee0c98d7aa746c54853b515eff1cd4948a41
+  metadata.gz: df44813409d2866fb2a6d9b03452cba24b995cedc72a201dd58d71fdf619dc9854614751c2721af39aa66f10ee2a0e62819b428e12112c052fcf5a011808edb9
+  data.tar.gz: c8ee7ae0c4d1e1bb03c065b0fecd1f25b853f58eb859213dcd367660413b9c81426ee6df928bc716ee767551d7480365c7c060a3a1d05c75ac5708c807ba8a4e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.1.5
+
+**Fixes and enhancements:**
+
+- Fix Process namespace collision with Sidekiq::Process
+
+## v0.1.4
+
+**Fixes and enhancements:**
+
+- Fix missing require
+
 ## v0.1.3
 
 **Fixes and enhancements:**

data/bin/sidekiq-loader

@@ -4,6 +4,7 @@
 require 'bundler/setup'
 require 'sidekiq-redeploy'
 require 'puma-redeploy'
+require 'optparse'
 
 def run_sidekiq(ops, logger)
   deployer = Puma::Redeploy::DeployerFactory.create(target: ops[:app_dir], watch_file: ops[:watch], logger:)

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
 
@@ -88,14 +88,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 +121,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.3'
+    VERSION = '0.1.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-redeploy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - tbeauvais
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma-redeploy