dispatch-rider 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ecc3cb31c588f86ad0fb803347f98752458ca2
-  data.tar.gz: 5945c905356d231948477a34104e7ebcbf9c385e
+  metadata.gz: 4ac24a060165ad6ab91933aeabf0b14b3f957269
+  data.tar.gz: 461b9b0084cc6882836b73ffe834965c2cb90721
 SHA512:
-  metadata.gz: e68f71bac1ba5447ccca27a199ea2a08f5a869601d7a760926f27d348537d902aafc9878050ece7b755010a9d26fa5b1631130c0dc836d71e7909774af8fcdad
-  data.tar.gz: 792dc04c2eea1c68c573889ebefe4c39c9b7fe200e6895922eade10b12a24da6f91d9a333240fe1872df7131f65933939e95218fa908fc56d0aa44a33cf315b6
+  metadata.gz: f542862dc97a880537e65006aeb56a68f0b265969664bf04b1417601cd611278d02c2bef5a7c6a637788d1021528da3ab3c0a8575a348c181c8e52045223aca0
+  data.tar.gz: 3b840b5a19ce2393be80349abfe24f38e9a13851fa9fecc1a4c9b7115fda72e57e44a1d52f4d49a9c21e949d7a4d6c9c0d265ef755291bba1ab40a841e4c9576

data/lib/dispatch-rider.rb

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

data/lib/dispatch-rider/demultiplexer.rb

@@ -12,6 +12,8 @@ module DispatchRider
       @dispatcher = dispatcher
       @error_handler = error_handler
       @continue = true
+      @current_message = nil
+      install_term_trap
     end
 
     def start
@@ -32,8 +34,22 @@ module DispatchRider
 
     private
 
+    def install_term_trap
+      SignalTools.append_trap('TERM') do
+        logger.info "Got SIGTERM while executing: #{message_info_fragment(@current_message)}"
+      end
+    end
+
+    def with_current_message(message)
+      @current_message = message
+      yield
+      @current_message = nil
+    end
+
     def dispatch_message(message)
-      dispatcher.dispatch(message)
+      with_current_message(message) do
+        dispatcher.dispatch(message)
+      end
     rescue => exception
       handle_message_error message, exception
       false

data/lib/dispatch-rider/signal_tools.rb

@@ -0,0 +1,8 @@
+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

data/lib/dispatch-rider/subscriber.rb

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

data/lib/dispatch-rider/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dispatch-rider
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Suman Mukherjee
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,6 +202,7 @@ 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
@@ -233,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Messaging system based on the reactor patter. You can publish messages to