harmoniser 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1a7c351ba8ed80091b6e32dbd3cb0486f6b4123b30de12f1406862f3bdedcbb
-  data.tar.gz: f3d68be4e8cc7cb83e5df89bbc20ce4bc905b44711d59a23de50e7ac761bc5ae
+  metadata.gz: f9feb1146437db2d23bb56ef1a72e47ef0912dbbc02b776c2ef026db44dc687e
+  data.tar.gz: 79dfe110ea228ba5ae58062c575768c8cc5747228a7a4a5432c36a686da7113d
 SHA512:
-  metadata.gz: 5c6da5317a0ea480766ce716b7710598d6a1720afd8bb24cf82f2aecd3b96e9d41b31b3246d306c525e5ddbb5532f8adb87c7b3188a402ecada8c87a192176fb
-  data.tar.gz: 9a31ed8616f30072245dbc783692cadf871c46f2082f627420fd71a38f6e29b3d9162b6152fdf741173a67e4a16fb5d1c8fbe812eaffb081356f4b83796ad510
+  metadata.gz: 47e94a951a8200b1e2ce2287f4fad5d4dda4ac6d4bf4d4e21a7f0bb03a51c8d95a949f0ef8dccc1f873558741ece21a0de89198d0d4325228869b0ad985d098a
+  data.tar.gz: d7d11b42621ce764702a408a3c1f789326cef84dfa15ad24d6f8c84ba5b2cd28ce4f4ca1496fd38bfc1aedb1a0d89381adf19825c76ef6d310389173782a03bd

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.12.0] - 2024-12-22
+
+### Changed
+- Perform retries connecting to RabbitMQ only if Harmoniser runs as the main process
+- Change from IO.pipe to Thread::Queue so that an OS signal is exchanged through a queue safely.
+
 ## [0.11.0] - 2024-10-09
 
 ### Added

data/lib/harmoniser/cli.rb

@@ -20,6 +20,7 @@ module Harmoniser
     def initialize
       @configuration = Harmoniser.default_configuration
       @logger = Harmoniser.logger
+      @queue = Thread::Queue.new
     end
 
     def call
@@ -38,39 +39,43 @@ module Harmoniser
     end
 
     def define_signals
-      @read_io, @write_io = IO.pipe
-
       ["INT", "TERM", "USR1"].each do |sig|
         Signal.trap(sig) do
-          @write_io.puts(sig)
+          @queue.push(sig)
         end
       end
     end
 
     def run
-      @launcher.start
-
       define_signals
-
-      while @read_io.wait_readable
-        signal = @read_io.gets.strip
-        handle_signal(signal)
-      end
+      start_launcher
+      await_signal
     rescue Interrupt
-      @write_io.close
-      @read_io.close
-      @launcher.stop
+      stop_launcher
       exit(0)
     rescue SigUsr1
-      @write_io.close
-      @read_io.close
-      @launcher.stop
+      stop_launcher
       exit(128 + 10)
     end
 
-    def handle_signal(signal)
+    def await_signal
+      signal = @queue.pop
       logger.info("Signal received: signal = `#{signal}`")
       SIGNAL_HANDLERS[signal].call(self, signal)
     end
+
+    def start_launcher
+      Thread.new do
+        await_signal
+      end.tap do |t|
+        t.abort_on_exception = true
+        t.report_on_exception = false
+        @launcher.start
+      end.kill
+    end
+
+    def stop_launcher
+      @launcher.stop
+    end
   end
 end

data/lib/harmoniser/connection.rb

@@ -32,14 +32,19 @@ module Harmoniser
       "<#{self.class.name}>:#{object_id} #{user}@#{host}:#{port}, connection_name = `#{connection_name}`, vhost = `#{vhost}`"
     end
 
-    # TODO Only perform retries when Harmoniser.server?
     def start
+      return @bunny.start unless Harmoniser.server?
+
+      retryable_start
+    end
+
+    def retryable_start
       retries = 0
       begin
-        with_signal_handler { @bunny.start }
+        @bunny.start
       rescue => e
         @logger.error("Connection attempt failed: retries = `#{retries}`, error_class = `#{e.class}`, error_message = `#{e.message}`")
-        with_signal_handler { sleep(1) }
+        sleep(1)
         retries += 1
         retry
       end
@@ -97,13 +102,5 @@ module Harmoniser
     def vhost
       @bunny.vhost
     end
-
-    # TODO Use Signal handler defined at Harmoniser::CLI instead of rescuing SignalException?
-    def with_signal_handler
-      yield if block_given?
-    rescue SignalException => e
-      @logger.info("Signal received: signal = `#{Signal.signame(e.signo)}`")
-      Harmoniser.server? ? exit(0) : raise
-    end
   end
 end

data/lib/harmoniser/version.rb

@@ -1,3 +1,3 @@
 module Harmoniser
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harmoniser
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Jose Lloret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 2024-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny