rabbit_messaging 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91522365755a8fd4311204e3419daed0e81cbc30a4e47d72e8db6ff7a1230b2
-  data.tar.gz: 470eecbf8666625d4ca314d01c24c4d1de2b8a3896838bd127d86bc9e43226b8
+  metadata.gz: da5252952f99344a807697e8c3bedd069160a41af4709af9b0120b5d0e486e90
+  data.tar.gz: c35f327f41ab3f2d9f358c1ac4d4e3bf688b9c2922da5624d96d61c70f57356c
 SHA512:
-  metadata.gz: 35e7ba113d41de62dc9a5eceb5c7dc47e1398182889af1c54025d87f2c1bc05fc49d80d45a791151773843c23669720f5edc10f05cadc153820c6532b248186b
-  data.tar.gz: 75332f60efe6ed6485bf4dc8e36162f5e7d39f5df6134ca7a16c1ba9223ab06f790ee76a7a1892bfd3dd20411164abdf8d6947ca0fbbd7a670453ec3e9a9f8f0
+  metadata.gz: b403d0df5c612f549d310bf9170b9ea7046fdbc65afbce868a4c291297f0b8060d4840b6a19fd7808a775f3d52946f7ebe1c79c23ef10133a2e37bc0847d2ad1
+  data.tar.gz: b4de5dda09cf5dc34ac46c7f8352aa840e477fddaca799ba80435d4ce4c72f525594075042d639145df0e3f424857c2e149709b6e506080be99c391823cb38c0

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.5.0] - 2025-05-19
+### Added
+- Added ability to split log message into parts
+- Optional `logger_message_size_limit` config for message size limit
+
+## [1.4.0] - 2025-03-10
+### Added
+- Introduced new configuration attributes for connection reset handling:
+  - `connection_reset_max_retries`
+  - `connection_reset_timeout`
+  - `connection_reset_exceptions`
+### Changed
+- Improved handling of `Bunny::ConnectionClosedError`:
+  - Added automatic reconnection with retries.
+  - Implemented configurable timeouts between retries.
+
 ## [1.2.0] - 2025-02-10
 ### Added
 - Add `ExponentialBackoffHandler` for handling errors in rabbit messages

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    rabbit_messaging (1.3.0)
+    rabbit_messaging (1.5.0)
       bunny (~> 2.0)
       kicks
       tainbox

data/README.md

@@ -127,6 +127,38 @@ require "rabbit_messaging"
   - `backoff_handler_max_retries` (`Integer`)
 
     Number of retries that `ExponentialBackoffHandler` will use before sending job to the error queue. 5 by default.
+
+  - `connection_reset_exceptions` (`Array`)
+
+    Exceptions for reset connection. Default:  [`Bunny::ConnectionClosedError`].
+
+  ```ruby
+    config.connection_reset_exceptions << MyInterestingException
+  ```
+
+  - `connection_reset_max_retries` (`Integer`)
+
+    Maximum number of reconnection attempts after a connection loss. Default: 10.
+  
+    ```ruby
+      config.connection_reset_max_retries = 20
+    ```
+
+  - `connection_reset_timeout` (`Float`)
+
+    The timeout duration before attempting to reset the connection. Default: 0.2 sec.
+
+    ```ruby
+      config.connection_reset_timeout = 0.2
+    ```
+
+  - `logger_message_size_limit` (`Integer`)
+
+    Maximum logger message size. Split message to parts if message is more than limit. Default: 9500.
+
+    ```ruby
+      config.logger_message_size_limit = 9500
+    ```
 ---
 
 ### Client

data/lib/rabbit/helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Rabbit
+  module Helper
+    def self.generate_message(message_part, parts, index)
+      if parts == 1
+        message_part
+      elsif index.zero?
+        "#{message_part}..."
+      elsif index == parts - 1
+        "...#{message_part}"
+      else
+        "...#{message_part}..."
+      end
+    end
+  end
+end

data/lib/rabbit/publishing.rb

@@ -10,23 +10,35 @@ module Rabbit
 
     MUTEX = Mutex.new
 
-    def publish(msg)
+    def publish(msg) # rubocop:disable Metrics/MethodLength
       return if Rabbit.config.skip_publish?
 
-      pool.with_channel msg.confirm_select? do |ch|
-        ch.basic_publish *msg.basic_publish_args
+      attempt = 0
+      begin
+        pool.with_channel msg.confirm_select? do |ch|
+          ch.basic_publish *msg.basic_publish_args
 
-        raise MessageNotDelivered, "RabbitMQ message not delivered: #{msg}" \
-          if msg.confirm_select? && !ch.wait_for_confirms
+          raise MessageNotDelivered, "RabbitMQ message not delivered: #{msg}" \
+            if msg.confirm_select? && !ch.wait_for_confirms
 
-        log msg
+          log msg
+        end
+      rescue *Rabbit.config.connection_reset_exceptions => error
+        attempt += 1
+        if attempt <= Rabbit.config.connection_reset_max_retries
+          sleep(Rabbit.config.connection_reset_timeout)
+          reinitialize_channels_pool
+          retry
+        else
+          raise error
+        end
+      rescue Timeout::Error
+        raise MessageNotDelivered, <<~MESSAGE
+          Timeout while sending message #{msg}. Possible reasons:
+            - #{msg.real_exchange_name} exchange is not found
+            - RabbitMQ is extremely high loaded
+        MESSAGE
       end
-    rescue Timeout::Error
-      raise MessageNotDelivered, <<~MESSAGE
-        Timeout while sending message #{msg}. Possible reasons:
-          - #{msg.real_exchange_name} exchange is not found
-          - RabbitMQ is extremely high loaded
-      MESSAGE
     end
 
     def pool
@@ -54,7 +66,17 @@ module Rabbit
         message.event, message.confirm_select? ? "confirm" : "no-confirm"
       ]
 
-      @logger.debug "#{metadata.join ' / '}: #{JSON.dump(message.data)}"
+      message_parts = JSON.dump(message.data)
+                          .scan(/.{1,#{Rabbit.config.logger_message_size_limit}}/)
+
+      message_parts.each_with_index do |message_part, index|
+        message = Rabbit::Helper.generate_message(message_part, message_parts.size, index)
+        @logger.debug "#{metadata.join ' / '}: #{message}"
+      end
+    end
+
+    def reinitialize_channels_pool
+      MUTEX.synchronize { @pool = ChannelsPool.new(create_client) }
     end
   end
 end

data/lib/rabbit/receiving/receive.rb

@@ -5,6 +5,7 @@ require "tainbox"
 require "rabbit"
 require "rabbit/receiving/queue"
 require "rabbit/receiving/job"
+require "rabbit/helper"
 
 class Rabbit::Receiving::Receive
   include Tainbox
@@ -21,9 +22,15 @@ class Rabbit::Receiving::Receive
   end
 
   def log!
-    Rabbit.config.receive_logger.debug(
-      [message, delivery_info, arguments].join(" / "),
-    )
+    message_parts = message.scan(/.{1,#{Rabbit.config.logger_message_size_limit}}/)
+
+    message_parts.each_with_index do |message_part, index|
+      message = Rabbit::Helper.generate_message(message_part, message_parts.size, index)
+
+      Rabbit.config.receive_logger.debug(
+        [message, delivery_info, arguments].join(" / "),
+      )
+    end
   end
 
   def process_message

data/lib/rabbit/receiving/worker.rb

@@ -9,9 +9,21 @@ class Rabbit::Receiving::Worker
   include Sneakers::Worker
 
   def work_with_params(message, delivery_info, arguments)
-    # args and info have custom rabbit classes, have to convert them to hash
-    receive_message(message, delivery_info.to_h, arguments.to_h)
-    ack!
+    attempt = 0
+    begin
+      # args and info have custom rabbit classes, have to convert them to hash
+      receive_message(message, delivery_info.to_h, arguments.to_h)
+      ack!
+    rescue *Rabbit.config.connection_reset_exceptions => error
+      attempt += 1
+      if attempt <= Rabbit.config.connection_reset_max_retries
+        sleep(Rabbit.config.connection_reset_timeout)
+        reinitialize_connection
+        retry
+      else
+        handle_error!(error)
+      end
+    end
   rescue => error
     handle_error!(error)
   end
@@ -31,4 +43,10 @@ class Rabbit::Receiving::Worker
     sleep 1
     requeue!
   end
+
+  def reinitialize_connection
+    stop
+    @queue.instance_variable_set(:@banny, nil)
+    run
+  end
 end

data/lib/rabbit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rabbit
-  VERSION = "1.3.0"
+  VERSION = "1.5.0"
 end

data/lib/rabbit.rb

@@ -30,6 +30,10 @@ module Rabbit
     attribute :skip_publishing_in, default: %i[test development]
     attribute :use_backoff_handler, :Boolean, default: false
     attribute :backoff_handler_max_retries, Integer, default: 6
+    attribute :connection_reset_max_retries, Integer, default: 10
+    attribute :connection_reset_timeout, Float, default: 0.2
+    attribute :connection_reset_exceptions, Array, default: [Bunny::ConnectionClosedError]
+    attribute :logger_message_size_limit, Integer, default: 9_500
 
     attribute :receive_logger, default: lambda {
       Logger.new(Rabbit.root.join("log", "incoming_rabbit_messages.log"))

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_messaging
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Umbrellio
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -76,6 +77,7 @@ files:
 - lib/rabbit/daemon.rb
 - lib/rabbit/event_handler.rb
 - lib/rabbit/extensions/bunny/channel.rb
+- lib/rabbit/helper.rb
 - lib/rabbit/publishing.rb
 - lib/rabbit/publishing/channels_pool.rb
 - lib/rabbit/publishing/job.rb
@@ -96,6 +98,7 @@ files:
 homepage: https://github.com/umbrellio/rabbit_messaging
 licenses: []
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,7 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Rabbit (Rabbit Messaging)
 test_files: []