rabbit_carrots 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a55e06c9742638b1eb1a44d65d98031f5c366adddd3fcb196064075f0c32eb30
-  data.tar.gz: 499acd59987bb9a6d4548c444e0829117ecc16289c719461e0b5e3be255df02c
+  metadata.gz: 3bbe59dfd2a28bbe73bb736c70214e88dab67ec860673fb856fbef99e160618a
+  data.tar.gz: 4ceac6041889f8ef802504d5342f860c9908bdcdd2f88b16fea7872073da23e4
 SHA512:
-  metadata.gz: 99f30870c37f1d334673fd6b6d5083cd4b2d4af419384590c204db60cddf6f16993582eeecdcf924a97302b13f5713772bdb9554d2d86757625c9aa689cd3456
-  data.tar.gz: 29586c246e82ab514b1fb8de9ffc4013865fa7e72ee07e6ddfec86fb7a4084c597272b1809b90708dab793325f5ff4c7129fcc79d301a743ae4238e2d60bad23
+  metadata.gz: af8a715a93424768b6fbe20aa5a442963ae643964b896f45604e27bb0c810259e1f7a9d5c8cd1fb4fa523b3ab10a2fb374200b2bb11bfce8fdd470a7f5228640
+  data.tar.gz: 7758e6422d668ae44dd9be62519afe5e863081f151f30a265f408e256cc701b20580fe8ce089e2d00233c5d4c1a3c1d8178d019ae95610ae752abec6f9c0d2d1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbit_carrots (1.0.1)
+    rabbit_carrots (1.0.3)
       bunny (>= 2.22)
       connection_pool (~> 2.4)
 
@@ -18,12 +18,12 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    amq-protocol (2.3.2)
+    amq-protocol (2.3.4)
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.4)
-    bunny (2.22.0)
-      amq-protocol (~> 2.3, >= 2.3.1)
+    bunny (2.24.0)
+      amq-protocol (~> 2.3)
       sorted_set (~> 1, >= 1.0.2)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
@@ -80,7 +80,7 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    set (1.1.0)
+    set (1.1.2)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)

data/README.md

@@ -36,6 +36,7 @@ RabbitCarrots.configure do |c|
   c.automatically_recover = true
   c.network_recovery_interval = 5
   c.recovery_attempts = 5
+  c.orm = :activerecord || :mongoid
   c.routing_key_mappings =  [
     { routing_keys: ['RK1', 'RK2'], queue: 'QUEUE_NAME', handler: 'CLASS HANDLER IN STRING' },
     { routing_keys: ['RK1', 'RK2'], queue: 'QUEUE_NAME', handler: 'CLASS HANDLER IN STRING' }

data/lib/puma/plugin/rabbit_carrots.rb

@@ -8,7 +8,7 @@ Puma::Plugin.create do
 
   def start(launcher)
     @log_writer = launcher.log_writer
-    @puma_pid = $$
+    @puma_pid = $PROCESS_ID
 
     @core_service = RabbitCarrots::Core.new(logger: log_writer)
 
@@ -43,6 +43,7 @@ Puma::Plugin.create do
     Process.kill('TERM', rabbit_carrots_pid)
     Process.wait(rabbit_carrots_pid)
   rescue Errno::ECHILD, Errno::ESRCH
+    log 'Rabbit Carrots already stopped'
   end
 
   def monitor_puma
@@ -57,7 +58,7 @@ Puma::Plugin.create do
     loop do
       if send(process_dead)
         log message
-        Process.kill('TERM', $$)
+        Process.kill('TERM', $PROCESS_ID)
         break
       end
       sleep 2

data/lib/rabbit_carrots/configuration.rb

@@ -19,5 +19,9 @@ module RabbitCarrots
                   :automatically_recover,
                   :network_recovery_interval,
                   :recovery_attempts
+
+    def orm
+      @orm ||= :activerecord
+    end
   end
 end

data/lib/rabbit_carrots/core.rb

@@ -2,18 +2,26 @@ module RabbitCarrots
   class Core
     attr_reader :logger
 
-    DatabaseAgonsticNotNullViolation = defined?(ActiveRecord) ? ActiveRecord::NotNullViolation : RabbitCarrots::EventHandlers::Errors::PlaceholderError
-    DatabaseAgonsticConnectionNotEstablished = defined?(ActiveRecord) ? ActiveRecord::ConnectionNotEstablished : Mongo::Error::SocketError
-    DatabaseAgnosticRecordInvalid = defined?(ActiveRecord) ? ActiveRecord::RecordInvalid : Mongoid::Errors::Validations
+    @database_agnostic_not_null_violation = nil
+    @database_agnostic_connection_not_established = nil
+    @database_agnostic_record_invalid = nil
+
+    class << self
+      attr_accessor :database_agnostic_not_null_violation, :database_agnostic_connection_not_established, :database_agnostic_record_invalid
+    end
 
     def initialize(logger: nil)
-      @logger = logger || Logger.new(Rails.env.production? ? '/proc/self/fd/1' : $stdout)
+      @logger = create_logger_adapter(logger || Logger.new(Rails.env.production? ? '/proc/self/fd/1' : $stdout))
       @threads = []
       @running = true
       @shutdown_requested = false
     end
 
     def start(kill_to_restart_on_standard_error: false)
+      self.class.database_agnostic_not_null_violation = RabbitCarrots.configuration.orm == :activerecord ? ActiveRecord::NotNullViolation : RabbitCarrots::EventHandlers::Errors::PlaceholderError
+      self.class.database_agnostic_connection_not_established = RabbitCarrots.configuration.orm == :activerecord ? ActiveRecord::ConnectionNotEstablished : ::Mongo::Error::SocketError
+      self.class.database_agnostic_record_invalid = RabbitCarrots.configuration.orm == :activerecord ? ActiveRecord::RecordInvalid : ::Mongoid::Errors::Validations
+
       channels = RabbitCarrots.configuration.routing_key_mappings.map do |mapping|
         { **mapping, handler: mapping[:handler].constantize }
       end
@@ -53,7 +61,7 @@ module RabbitCarrots
     def request_shutdown
       # Workaround to a known issue with Signal Traps and logs
       Thread.start do
-        logger.log 'Shutting down Rabbit Carrots service...'
+        logger.error 'Shutting down Rabbit Carrots service...'
       end
       @shutdown_requested = true
       @threads.each(&:kill)
@@ -63,7 +71,7 @@ module RabbitCarrots
     def stop
       # Workaround to a known issue with Signal Traps and logs
       Thread.start do
-        logger.log 'Stoppig the Rabbit Carrots service...'
+        logger.error 'Stoppig the Rabbit Carrots service...'
       end
       @running = false
     end
@@ -72,7 +80,7 @@ module RabbitCarrots
       RabbitCarrots::Connection.instance.channel.with do |channel|
         exchange = channel.topic(RabbitCarrots.configuration.rabbitmq_exchange_name, durable: true)
 
-        logger.log "Listening on QUEUE: #{queue_name} for ROUTING KEYS: #{routing_keys}"
+        logger.info "Listening on QUEUE: #{queue_name} for ROUTING KEYS: #{routing_keys}"
         queue = channel.queue(queue_name, durable: true, arguments: queue_arguments)
 
         routing_keys.map(&:strip).each { |k| queue.bind(exchange, routing_key: k) }
@@ -80,34 +88,51 @@ module RabbitCarrots
         queue.subscribe(block: false, manual_ack: true, prefetch: 10) do |delivery_info, properties, payload|
           break if @shutdown_requested
 
-          logger.log "Received from queue: #{queue_name}, Routing Keys: #{routing_keys}"
+          logger.info "Received from queue: #{queue_name}, Routing Keys: #{routing_keys}"
           handler_class.handle!(channel, delivery_info, properties, payload)
           channel.ack(delivery_info.delivery_tag, false)
         rescue RabbitCarrots::EventHandlers::Errors::NackMessage, JSON::ParserError => _e
-          logger.log "Nacked message: #{payload}"
+          logger.warn "Nacked message: #{payload}"
           channel.nack(delivery_info.delivery_tag, false, false)
         rescue RabbitCarrots::EventHandlers::Errors::NackAndRequeueMessage => _e
-          logger.log "Nacked and Requeued message: #{payload}"
+          logger.warn "Nacked and Requeued message: #{payload}"
           channel.nack(delivery_info.delivery_tag, false, true)
-        rescue DatabaseAgonsticNotNullViolation, DatabaseAgnosticRecordInvalid => e
-          logger.log "Null constraint or Invalid violation: #{payload}. Error: #{e.message}"
+        rescue self.class.database_agnostic_not_null_violation, self.class.database_agnostic_record_invalid => e
+          logger.warn "Null constraint or Invalid violation: #{payload}. Error: #{e.message}"
           channel.ack(delivery_info.delivery_tag, false)
-        rescue DatabaseAgonsticConnectionNotEstablished => e
-          logger.log "Error connection not established to the database: #{payload}. Error: #{e.message}"
+        rescue self.class.database_agnostic_connection_not_established => e
+          logger.warn "Error connection not established to the database: #{payload}. Error: #{e.message}"
           sleep 3
           channel.nack(delivery_info.delivery_tag, false, true)
         rescue StandardError => e
-          logger.log "Error handling message: #{payload}. Error: #{e.message}"
+          logger.error "Error handling message: #{payload}. Error: #{e.message}"
           sleep 3
           channel.nack(delivery_info.delivery_tag, false, true)
           Process.kill('SIGTERM', Process.pid) if kill_to_restart_on_standard_error
         end
-
-        logger.log "Ending task for queue: #{queue_name}"
       end
     rescue StandardError => e
       logger.error "Bunny session error: #{e.message}"
       request_shutdown
     end
+
+    private
+
+    def create_logger_adapter(logger)
+      return logger if logger.respond_to?(:info) && logger.respond_to?(:error) && logger.respond_to?(:warn)
+
+      adapter = Object.new
+      def adapter.info(msg)
+        @logger.write("[INFO] #{msg}\n")
+      end
+      def adapter.error(msg)
+        @logger.write("[ERROR] #{msg}\n")
+      end
+      def adapter.warn(msg)
+        @logger.write("[WARN] #{msg}\n")
+      end
+      adapter.instance_variable_set(:@logger, logger)
+      adapter
+    end
   end
 end

data/lib/rabbit_carrots/errors.rb

@@ -0,0 +1,18 @@
+module RabbitCarrots
+  class Error < StandardError; end
+
+  module EventHandlers
+    module Errors
+      class IrrelevantMessage < StandardError
+      end
+
+      class NackMessage < StandardError
+      end
+
+      class NackAndRequeueMessage < StandardError
+      end
+
+      class PlaceholderError < Error; end
+    end
+  end
+end

data/lib/rabbit_carrots/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RabbitCarrots
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end

data/lib/rabbit_carrots.rb

@@ -1,26 +1,11 @@
 # frozen_string_literal: true
 
 require_relative 'rabbit_carrots/version'
+require 'rabbit_carrots/errors'
 require 'rabbit_carrots/connection'
-require 'rabbit_carrots/core'
 require 'rabbit_carrots/configuration'
 require 'rabbit_carrots/railtie' if defined?(Rails)
+require 'rabbit_carrots/core'
 
 module RabbitCarrots
-  class Error < StandardError; end
-
-  module EventHandlers
-    module Errors
-      class IrrelevantMessage < StandardError
-      end
-
-      class NackMessage < StandardError
-      end
-
-      class NackAndRequeueMessage < StandardError
-      end
-
-      class PlaceholderError < Error; end
-    end
-  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_carrots
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Brusk Awat
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2025-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -59,6 +58,7 @@ files:
 - lib/rabbit_carrots/configuration.rb
 - lib/rabbit_carrots/connection.rb
 - lib/rabbit_carrots/core.rb
+- lib/rabbit_carrots/errors.rb
 - lib/rabbit_carrots/railtie.rb
 - lib/rabbit_carrots/tasks/rmq.rake
 - lib/rabbit_carrots/version.rb
@@ -72,7 +72,6 @@ metadata:
   source_code_uri: https://github.com/ditkrg/rabbit_carrots
   changelog_uri: https://github.com/ditkrg/rabbit_carrots
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -87,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A simple RabbitMQ consumer task
 test_files: []