harmoniser 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64be8cb27f910668f1c7d88a546d87b9775f75cfc5a6626ecb6e825409dbc7a4
-  data.tar.gz: 0b82a72f0e80548db66341adf5748654f7751f3b74a08fa2e5613c043876d8fc
+  metadata.gz: 22ff604975432b081956834ca20441d85c8ae98ce690a6185daea4e0d7a1eb11
+  data.tar.gz: 1b5c12440738254845b8f7d717013f5306ea760df126cc702dbce178af9e7f32
 SHA512:
-  metadata.gz: ef1b871763652b0090be1248c259c94846e8132925f6346051b51d4b0d4d2a95a758d5c8762edbb22793ae5c7f9e2e3fafbc1d108551854005d695a79a5927f8
-  data.tar.gz: 79643c9b0a50769cc7968740bbb3f6aba2461c3800a136651b1206b523e7fbb8768f9ceac85dba83f0b3a029923d9a148cf0c60bde1397385d449e845899386e
+  metadata.gz: '0568d8afd4545a550a645f016936cc27866973216a20a3aa7cb9b083b8e62ce0fab3e6dca8e1b5dadf8104edc7a7f08a165d1b252dc94fcb0ee631fe489f19d8'
+  data.tar.gz: cf2e9b2f429f0bf8a4abf7741f893d732fa8cde55935aa3f518222e1aaf1857313019c6b9f049b4fdf0be8882b5c392a1dc6dbfd70e0048a9826a4af89edcc5e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.8.1] - 2024-04-08
+
+### Fixed
+- Exit ruby process when harmoniser is not the main process. More details at [issue](https://github.com/jollopre/harmoniser/issues/41).
+
+## [0.8.0] - 2024-03-31
+
+### Added
+- Implement retry mechanism to establish connection to RabbitMQ. More details at [issue](https://github.com/jollopre/harmoniser/issues/39).
+- Strengthen at_exit hook to not break when connection cannot be closed.
+
 ## [0.7.0] - 2024-01-03
 
 ### Added

data/lib/harmoniser/cli.rb

@@ -22,7 +22,6 @@ module Harmoniser
 
     def call
       parse_options
-      define_signals
       run
     end
 
@@ -50,6 +49,8 @@ module Harmoniser
         .new(configuration: configuration, logger: logger)
         .start
 
+      define_signals
+
       while @read_io.wait_readable
         signal = @read_io.gets.strip
         handle_signal(signal)

data/lib/harmoniser/connectable.rb

@@ -37,11 +37,10 @@ module Harmoniser
       logger = Harmoniser.logger
 
       logger.info("Shutting down!")
-      if connection? && connection.open?
-        stringified_connection = connection.to_s
-        logger.info("Connection will be closed: connection = `#{stringified_connection}`")
-        connection.close
-        logger.info("Connection closed: connection = `#{stringified_connection}`")
+      if connection? && @connection.open?
+        logger.info("Connection will be closed: connection = `#{@connection}`")
+        @connection.close
+        logger.info("Connection closed: connection = `#{@connection}`")
       end
       logger.info("Bye!")
     end

data/lib/harmoniser/connection.rb

@@ -27,7 +27,7 @@ module Harmoniser
       write_timeout: 5
     }
 
-    def_delegators :@bunny, :close, :create_channel, :open?, :recovering_from_network_failure?, :start
+    def_delegators :@bunny, :create_channel, :open?, :recovering_from_network_failure?
 
     def initialize(opts)
       @bunny = Bunny.new(opts)
@@ -37,6 +37,26 @@ module Harmoniser
       "<#{self.class.name}>: #{user}@#{host}:#{port}, connection_name = `#{connection_name}`, vhost = `#{vhost}`"
     end
 
+    def start
+      retries = 0
+      begin
+        with_signal_handler { @bunny.start }
+      rescue => e
+        Harmoniser.logger.error("Connection attempt failed: retries = `#{retries}`, error_class = `#{e.class}`, error_message = `#{e.message}`")
+        with_signal_handler { sleep(1) }
+        retries += 1
+        retry
+      end
+    end
+
+    def close
+      @bunny.close
+      true
+    rescue => e
+      Harmoniser.logger.error("Connection#close failed: error_class = `#{e.class}`, error_message = `#{e.message}`")
+      false
+    end
+
     private
 
     def connection_name
@@ -58,5 +78,12 @@ module Harmoniser
     def vhost
       @bunny.vhost
     end
+
+    def with_signal_handler
+      yield if block_given?
+    rescue SignalException => e
+      Harmoniser.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.7.0"
+  VERSION = "0.8.1"
 end

data/lib/harmoniser.rb

@@ -7,4 +7,10 @@ require "harmoniser/subscriber"
 module Harmoniser
   extend Configurable
   extend Loggable
+
+  class << self
+    def server?
+      !!defined?(CLI)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harmoniser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jose Lloret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny