rt-tackle 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63bc52d4f711f20e99c10694d51a721971263931
-  data.tar.gz: 90c678ff964a4e1e9a0c162f1dd539951cf8bf9e
+  metadata.gz: f81be29c18afeff98eac2923d0b314ac755e4aa0
+  data.tar.gz: 97f8549bc884f7e809e2f81bf16cf0f9d06bda07
 SHA512:
-  metadata.gz: 06e85b388d9d887761b89f32a4024bc85d0fc497f0189b16d023fa4dbdc48bd1958f84b780ff18b91215fa03977ffb385ed7fa380e581018d1ccd1e3419f5fb7
-  data.tar.gz: 863b47df45b8f0a38e583ddd2a3dd89b4c3f91c6489b43af27d5f7b4cca1ab5f6889088bff08c176bea54cd6b3aff3c903da3f7d6793eaa2c8dccaa950bbd72f
+  metadata.gz: 997a247bf3e1f9fae45d4897b93af6d2fe4bf2c3ec608c74a3debd3d9bde6e0f092c5fd8502264077dfb23f8ed06815b421ee2ff0ea0be4a8606e65c8c21c5d1
+  data.tar.gz: 9ec4f523a1178854b0c2de2aca6cad0b11ee038a224ff77fb3fd7fa72852a96d7c15f7f8493840ab49f8e775f27ae76c0335dcd2d7b3061eee887dab3a8993cc

data/lib/tackle/consumer.rb

@@ -7,6 +7,7 @@ module Tackle
   require_relative "consumer/main_queue"
   require_relative "consumer/delay_queue"
   require_relative "consumer/dead_queue"
+  require_relative "consumer/active_record_connection_reaper"
 
   class Consumer
 
@@ -41,26 +42,30 @@ module Tackle
     end
 
     def process_message(message, &block)
-      message.log_info "Calling message processor"
-
-      response = block.call(message.payload)
-
-      unless @params.manual_ack?
-        response = Tackle::ACK
+      Tackle::Consumer::ActiveRecordConnectionReaper.run do
+        begin
+          message.log_info "Calling message processor"
+
+          response = block.call(message.payload)
+
+          unless @params.manual_ack?
+            response = Tackle::ACK
+          end
+
+          case response
+          when Tackle::ACK
+            message.ack
+          when Tackle::NACK
+            redeliver_message(message, "Received Tackle::NACK")
+          else
+            raise "Response must be either Tackle::ACK or Tackle::NACK"
+          end
+        rescue Exception => ex
+          redeliver_message(message, "Received exception '#{ex}'")
+
+          raise ex
+        end
       end
-
-      case response
-      when Tackle::ACK
-        message.ack
-      when Tackle::NACK
-        redeliver_message(message, "Received Tackle::NACK")
-      else
-        raise "Response must be either Tackle::ACK or Tackle::NACK"
-      end
-    rescue Exception => ex
-      redeliver_message(message, "Received exception '#{ex}'")
-
-      raise ex
     end
 
     def redeliver_message(message, reason)

data/lib/tackle/consumer/active_record_connection_reaper.rb

@@ -0,0 +1,31 @@
+module Tackle
+  class Consumer
+    module ActiveRecordConnectionReaper
+      module_function
+
+      #
+      # In case of a database failover, the active database connection can get
+      # stuck and unable to re-connect.
+      #
+      # It is important to clear all active connections after when a message
+      # is consumed. In case of a database failover, a new fresh connection will
+      # be created that is able to communicate with the database properly.
+      #
+      # This technique is borrowed from Sidekiq:
+      #
+      # <https://github.com/mperham/sidekiq/blob/5-0/lib/sidekiq/middleware/server/active_record.rb>
+
+      def run
+        yield
+      ensure
+        #
+        # This is no longer necessary in Rails 5+
+        #
+        if defined?(::ActiveRecord) && ActiveRecord::VERSION::MAJOR < 5
+          ::ActiveRecord::Base.clear_active_connections!
+        end
+      end
+
+    end
+  end
+end

data/lib/tackle/version.rb

@@ -1,3 +1,3 @@
 module Tackle
-  VERSION = "1.1.2".freeze
+  VERSION = "1.2.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rt-tackle
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Rendered Text
@@ -98,6 +98,7 @@ files:
 - lib/tackle.rb
 - lib/tackle/connection.rb
 - lib/tackle/consumer.rb
+- lib/tackle/consumer/active_record_connection_reaper.rb
 - lib/tackle/consumer/dead_queue.rb
 - lib/tackle/consumer/delay_queue.rb
 - lib/tackle/consumer/exchange.rb