Merge pull request #29 from ivx/fix-signal-traps

Fix signal traps

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.11.1 (2023-09-08)
+
+- Bugfix: trapped signals INT and TERM now calls correctly previous set signal handler
+
 ## 0.11.0 (2023-05-30)
 
 - **[Breaking]**: Provide the Bunny connection option `recovery_attempts` in Ears configuration. It

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ears (0.11.0)
+    ears (0.11.1)
       bunny (~> 2.22.0)
       multi_json
 

lib/ears.rb

@@ -51,10 +51,9 @@ def setup(&block)
     # Blocks the calling thread until +SIGTERM+ or +SIGINT+ is received.
     # Used to keep the process alive while processing messages.
     def run!
-      running = true
-      Signal.trap('INT') { running = false }
-      Signal.trap('TERM') { running = false }
-      sleep 1 while running && @error.nil?
+      @running = true
+      setup_traps
+      sleep 1 while @running && @error.nil?
       raise @error if @error
     end
 
@@ -82,6 +81,19 @@ def reset!
 
     private
 
+    def setup_traps
+      @previous_int_trap =
+        Signal.trap('INT') do
+          @running = false
+          @previous_int_trap&.call unless @previous_int_trap == 'DEFAULT'
+        end
+      @previous_term_trap =
+        Signal.trap('TERM') do
+          @running = false
+          @previous_term_trap&.call unless @previous_term_trap == 'DEFAULT'
+        end
+    end
+
     def connection_config
       {
         connection_name: configuration.connection_name,

lib/ears/version.rb

@@ -1,3 +1,3 @@
 module Ears
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end