toiler 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6565dc34ea694f3407a7bf58108134a277197f1e145990749e0de7cb53f9d02f
-  data.tar.gz: 13f9b2aa0c289b4e66098e942c15ef79e402db53ccd67fd8b06bafba0c292377
+  metadata.gz: fc813573ecab24cb043e85d2743c730863f1315536c522dd6bad3704d64f75db
+  data.tar.gz: 9a7bd308ee94283d6633eb3877fe22c14b06866ddd085c2249b94cc6cbfa8703
 SHA512:
-  metadata.gz: 34ca2858e5a70f8cf0187a93f3d32d98b28153d4b184aa89d42534ca6aeed5cabd514b4e7b92d24fe88900f623f23fc39ad6e991f0852676c1f250a60add0032
-  data.tar.gz: 8c719d64993aa04ea0e3e3f9e794c9c97a1925c776187f87f398f30df7ae266ef2235b0e103560c4cacbdb32223cc923175299f7f50fc4d27c670216dad9e294
+  metadata.gz: 593a212957bc7f962f3559c5f454b581bfdb68ac4026893e83f923f25e38771781e0a3449808401546ccdae4aaedcfb6e9ea64f41bff29c9a60eeb8c4d560621
+  data.tar.gz: a5c66a263d9029afe2237a48437a01d92d60984d8ff600edde54deb15848fc58bf924c86717047624cf7f446e73012eb5049649d1ed950d931cfb2cc3ac1fa3c

data/lib/toiler/cli.rb

@@ -42,8 +42,10 @@ module Toiler
     private
 
     def handle_stop
-      while (readable_io = @self_read.wait_readable)
-        handle_signal(readable_io.first[0].gets.strip)
+      # from https://github.com/mperham/sidekiq/blob/6eadad86f9748727ac1e428389f4f67d45103025/lib/sidekiq/cli.rb#L123
+      while @self_read.wait_readable
+        signal = @self_read.gets.strip
+        handle_signal(signal)
       end
     rescue WaitShutdown => e
       Toiler.logger.info "Received Interrupt, Waiting up to #{e.wait} seconds for actors to finish..."
@@ -72,7 +74,16 @@ module Toiler
 
     def trap_signals
       %w[INT TERM QUIT USR1 USR2 TTIN ABRT].each do |sig|
-        trap sig do
+        # from https://github.com/mperham/sidekiq/blob/6eadad86f9748727ac1e428389f4f67d45103025/lib/sidekiq/cli.rb#L54
+        old_handler = Signal.trap sig do
+          if old_handler.respond_to?(:call)
+            begin
+              old_handler.call
+            rescue Exception => exc
+              # signal handlers can't use Logger so puts only
+              puts ["Error in #{sig} handler", exc].inspect
+            end
+          end
           @self_write.puts(sig)
         end
       rescue ArgumentError

data/lib/toiler/version.rb

@@ -2,5 +2,5 @@
 
 # Toiler Version
 module Toiler
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toiler
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sebastian Schepens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec