dispatch-rider 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b012324043e834bb969b954be7155db10dfef3
-  data.tar.gz: 518a531a1b759c8ec46c23f86fd00ca49c9a4f24
+  metadata.gz: 8f3c1d68135996d3628b82282bbed5c3675f65b6
+  data.tar.gz: e4ac7f3fba37caf912d6234f46c6b6d4a7ce844c
 SHA512:
-  metadata.gz: 88725c8098ff777bf56e7db51652604cf1b32142a8816b74842c614be79133d3233851d0057d74c9ea1805d6b283d0d9d432488271a2aceb9fb9a380f964baeb
-  data.tar.gz: f5374cb26723f85e00c9041e82c7c9d718a1b535ba32894fb70bf30b192a11673bcc4ac1b95aff04a0c08f4a77148f23223ee5aa2d36eb13f87e0df4b0d4876b
+  metadata.gz: 2f033db5fe1c3eae2ab79a4c788d361274bf15a7ce70343377497843232a0167a744d704d2beda5016452f5911dfd82a1ff1dba4998e6f683cbb1ecb2f8e5300
+  data.tar.gz: 4bfc2d394353d7dbef8688000a2a2d6e752aeba7fa06e445e6e9ea176100db9044528c55856036a49547c25ea46d30e266ece6c6fa555d50a3c6d921ba1e9eb6

data/lib/dispatch-rider.rb

@@ -24,7 +24,6 @@ module DispatchRider
 end
 
 require "dispatch-rider/debug"
-require "dispatch-rider/signal_tools"
 require "dispatch-rider/errors"
 require "dispatch-rider/error_handlers"
 require "dispatch-rider/handlers"

data/lib/dispatch-rider/demultiplexer.rb

@@ -13,7 +13,6 @@ module DispatchRider
       @error_handler = error_handler
       @continue = true
       @current_message = nil
-      install_term_trap
     end
 
     def start
@@ -28,23 +27,22 @@ module DispatchRider
       self
     end
 
-    def stop
+    def stop(reason: nil)
       @continue = false
+      if @current_message
+        logger.info "Got stop #{reason ? '(' + reason + ') ' : ' ' }while executing: #{message_info_fragment(@current_message)}"
+      end
     end
 
     private
 
-    def install_term_trap
-      SignalTools.append_trap('TERM') do
-        logger.info "Got SIGTERM while executing: #{message_info_fragment(@current_message)}" if @current_message
-      end
-    end
-
     def with_current_message(message)
-      @current_message = message
-      result = yield
-      @current_message = nil
-      result
+      begin
+        @current_message = message
+        yield
+      ensure
+        @current_message = nil
+      end
     end
 
     # This needs to return true/false based on the success of the jobs!

data/lib/dispatch-rider/subscriber.rb

@@ -40,30 +40,30 @@ module DispatchRider
     private
 
     def register_quit_trap
-      SignalTools.append_trap("QUIT") do
+      Signal.trap("QUIT") do
         # signal number: 3
         logger.info "Received SIGQUIT, stopping demultiplexer"
-        demultiplexer.stop
+        demultiplexer.stop("Got SIGQUIT")
       end
     end
 
     def register_term_trap
-      SignalTools.append_trap("TERM") do
+      Signal.trap("TERM") do
         # signal number: 15
         logger.info "Received SIGTERM, stopping demultiplexer"
-        demultiplexer.stop
+        demultiplexer.stop("Got SIGTERM")
       end
     end
 
     def register_int_trap
       @already_interrupted = false
-      SignalTools.append_trap("INT") do
+      Signal.trap("INT") do
         if @already_interrupted
           logger.info "Received SIGINT second time, aborting"
           exit(0)
         else
           logger.info "Received SIGINT first time, stopping demultiplexer"
-          demultiplexer.stop
+          demultiplexer.stop("Got SIGINT")
         end
         @already_interrupted = true
       end

data/lib/dispatch-rider/version.rb

@@ -1,4 +1,4 @@
 # This file specifies the current version of the gem.
 module DispatchRider
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dispatch-rider
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Suman Mukherjee
@@ -203,7 +203,6 @@ files:
 - lib/dispatch-rider/registrars/queue_service.rb
 - lib/dispatch-rider/registrars/sns_channel.rb
 - lib/dispatch-rider/runner.rb
-- lib/dispatch-rider/signal_tools.rb
 - lib/dispatch-rider/subscriber.rb
 - lib/dispatch-rider/version.rb
 - lib/generators/dispatch_rider/install/USAGE

data/lib/dispatch-rider/signal_tools.rb

@@ -1,8 +0,0 @@
-module SignalTools
-  def self.append_trap(signal, &block)
-    old_handler = trap(signal) do
-      block.call
-      old_handler.call if old_handler.respond_to?(:call)
-    end
-  end
-end