rabbit_carrots 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a55e06c9742638b1eb1a44d65d98031f5c366adddd3fcb196064075f0c32eb30
-  data.tar.gz: 499acd59987bb9a6d4548c444e0829117ecc16289c719461e0b5e3be255df02c
+  metadata.gz: 512be53850324ba32bfdf38f6069561fb4cff9cd3e21c7acd3f431ade7533603
+  data.tar.gz: 297df24712a1eed2dd55902845ade84a1d44b714f69c75a1ac97be98baf15de8
 SHA512:
-  metadata.gz: 99f30870c37f1d334673fd6b6d5083cd4b2d4af419384590c204db60cddf6f16993582eeecdcf924a97302b13f5713772bdb9554d2d86757625c9aa689cd3456
-  data.tar.gz: 29586c246e82ab514b1fb8de9ffc4013865fa7e72ee07e6ddfec86fb7a4084c597272b1809b90708dab793325f5ff4c7129fcc79d301a743ae4238e2d60bad23
+  metadata.gz: 260c156c6794fc7b3c92ccd1f946c47e3ad004c01ec15f0bdd1875812d030a4d3983b67ed6106041370e97840db22da65afac2fe17d682cc97267ac926a17c2c
+  data.tar.gz: 7ddc79c2c86c6db3fda8f3ec20cd9cac7750b054c01a0a96837ff9a02af5290e774718c6bb7b54d520fd3fd972a9e1bba5c614fa530c0cbb98f5f06542aa3ed8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rabbit_carrots (1.0.1)
+    rabbit_carrots (1.0.2)
       bunny (>= 2.22)
       connection_pool (~> 2.4)
 

data/lib/rabbit_carrots/configuration.rb

@@ -18,6 +18,10 @@ module RabbitCarrots
                   :rabbitmq_exchange_name,
                   :automatically_recover,
                   :network_recovery_interval,
-                  :recovery_attempts
+                  :recovery_attempts,
+                  :orm
+    def orm
+      @orm ||= :activerecord
+    end
   end
 end

data/lib/rabbit_carrots/core.rb

@@ -2,9 +2,13 @@ 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)
@@ -14,6 +18,10 @@ module RabbitCarrots
     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
@@ -89,10 +97,10 @@ module RabbitCarrots
         rescue RabbitCarrots::EventHandlers::Errors::NackAndRequeueMessage => _e
           logger.log "Nacked and Requeued message: #{payload}"
           channel.nack(delivery_info.delivery_tag, false, true)
-        rescue DatabaseAgonsticNotNullViolation, DatabaseAgnosticRecordInvalid => e
+        rescue self.class.database_agnostic_not_null_violation, self.class.database_agnostic_record_invalid => e
           logger.log "Null constraint or Invalid violation: #{payload}. Error: #{e.message}"
           channel.ack(delivery_info.delivery_tag, false)
-        rescue DatabaseAgonsticConnectionNotEstablished => e
+        rescue self.class.database_agnostic_connection_not_established => e
           logger.log "Error connection not established to the database: #{payload}. Error: #{e.message}"
           sleep 3
           channel.nack(delivery_info.delivery_tag, false, true)
@@ -102,8 +110,6 @@ module RabbitCarrots
           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}"

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.2'
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_carrots
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brusk Awat
@@ -59,6 +59,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