toiler 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2db74f11b3d29deb51e673e5bbb317b087da26b
-  data.tar.gz: b40560d3d2fbc5e0781154eb509988ca2bbb93c9
+  metadata.gz: d5b3fa5e5c309c7e6b3f80c883c9834850b0fe97
+  data.tar.gz: e9db1cf4e3d1226a8e200bfabd24b52f7664ab15
 SHA512:
-  metadata.gz: afaa74f96f030f0e521bdb8cb6948a4839772428c4bb427da62fac78a0c2bfa87aa72506080ae1c25c57b6b659f324c4c99b19b6acb8a70b52508eb69036d601
-  data.tar.gz: a6deb6ab20852811f794d3b4f97abd3c7d6b5ab9e0aa5f3578d01bc0f3dfee9a588fed13b8c8cf95c46f1165000830d4d9a9520bb052750d360e05b883cfa231
+  metadata.gz: db9a13283091cd3057044a84194c418a3249b1c4854879f15ccbc06e5f2e975a9a24bd8a83c1b02122797cc9c394b60c40065a9964fc2aef31ef918d407c1485
+  data.tar.gz: cb0751b3a4e0cd902828833110bfd8132e4d147308e13db10b95cd3cc11970efb3afd3121cc119929d3dfe8df370f22f3dedc45559ed32da8ad7759490fdcc07

data/lib/toiler.rb

@@ -65,6 +65,7 @@ module Toiler
       auto_visibility_timeout: false,
       concurrency: 1,
       auto_delete: false,
+      shutdown_timeout: 5,
       batch: false
     }
   end

data/lib/toiler/cli.rb

@@ -7,6 +7,15 @@ module Toiler
   # See: https://github.com/mperham/sidekiq/blob/33f5d6b2b6c0dfaab11e5d39688cab7ebadc83ae/lib/sidekiq/cli.rb#L20
   class Shutdown < Interrupt; end
 
+  class WaitShutdown < Interrupt
+    attr_accessor :wait
+
+    def initialize(wait)
+      super
+      @wait = wait
+    end
+  end
+
   # Command line client interface
   class CLI
     include Singleton
@@ -33,13 +42,13 @@ module Toiler
       while (readable_io = IO.select([@self_read]))
         handle_signal(readable_io.first[0].gets.strip)
       end
-    rescue Interrupt
-      Toiler.logger.info 'Received Interrupt, Waiting up to 60 seconds for actors to finish...'
-      success = supervisor.ask(:terminate!).wait(60)
+    rescue WaitShutdown => shutdown_error
+      Toiler.logger.info "Received Interrupt, Waiting up to #{shutdown_error.wait} seconds for actors to finish..."
+      success = supervisor.ask(:terminate!).wait(shutdown_error.wait)
       if success
         Toiler.logger.info 'Supervisor successfully terminated'
       else
-        Toiler.logger.info 'Timeout waiting dor Supervisor to terminate'
+        Toiler.logger.info 'Timeout waiting for Supervisor to terminate'
       end
     ensure
       exit 0
@@ -58,7 +67,7 @@ module Toiler
     end
 
     def trap_signals
-      %w(INT TERM QUIT USR1 USR2 TTIN).each do |sig|
+      %w(INT TERM QUIT USR1 USR2 TTIN ABRT).each do |sig|
         begin
           trap sig do
             @self_write.puts(sig)
@@ -109,7 +118,9 @@ module Toiler
         print_stacktraces
         print_status
       when 'INT', 'TERM'
-        fail Interrupt
+        fail WaitShutdown, 60
+      when 'ABRT'
+        fail WaitShutdown, Toiler.options[:shutdown_timeout] * 60
       end
     end
 

data/lib/toiler/version.rb

@@ -1,4 +1,4 @@
 # Toiler Version
 module Toiler
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toiler
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Sebastian Schepens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler