qwrapper 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 067dd75b70804a46400c8f52f517ac39348e4c88
-  data.tar.gz: 4f2f4aebcfdd7f8476867d191ec9b8df26f25965
+  metadata.gz: 428aa9d04e2124f91d54aca54c8bce80c0397b93
+  data.tar.gz: 0e868856d631ce54a0bcfd9f8d827d947c52e604
 SHA512:
-  metadata.gz: ffafd53ee24d682913b451c6f331d3768e175874894327046ac47c62c34ec6115a7de0b25a2b1e0f47d270f5a96a3fcda105a146e2026d81a8f4d41bd14b600c
-  data.tar.gz: dcdd6edd2bc7a4dcad953591eb32c1ad449082a18e3ddb1afc01dd8f0c1a591fbb6aef7eb0571d0f7d7b4b73a26fc56ae74b868024e4c8b355141688b7523a3e
+  metadata.gz: 3a6bf19733bcb80047613a4ef6925a017b3cea783f9eb03bcdfcf6f44a3b3c697ea06e6f5376c793653ad2ffbb87402e80cf393751d82450c6ea0a05f9216f82
+  data.tar.gz: 05f84c3512b945ebd91d02be3aec16ddd1f4d619205ba8d5412aa6234dc8907a4cb09b8a43208bfc9fedfa744bf2c7ec9f5e8c72e83a3f367c275c2a991aa09f

data/lib/qwrapper.rb

@@ -26,6 +26,14 @@ module Qwrapper
       @config ||= {}
     end
 
+    def connect!
+      queue.connect! if queue
+    end
+
+    def disconnect!
+      queue.disconnect! if queue
+    end
+
     def queue
       @queue ||= begin
         base = Qwrapper::Queues::Base

data/lib/qwrapper/queues/base.rb

@@ -7,21 +7,27 @@ module Qwrapper
       include Loggable
 
       attr_accessor :config
-      attr_reader :requeue_exceptions
+      attr_reader :requeue_errors, :requeue_lambda
 
       def initialize(options)
         @config = options
         @logger = options[:logger] if options.has_key?(:logger)
       end
 
-      def requeue_exceptions
-        @requeue_exceptions ||= begin
-          requeueable_exceptions = config[:requeue_exceptions] || []
+      def requeue_errors
+        @requeue_errors ||= begin
+          requeueable_exceptions = config[:requeue_errors] || []
           requeueable_exceptions << Qwrapper::RequeueError
           requeueable_exceptions.uniq
         end
       end
 
+      def requeue_lambda
+        @requeue_lambda ||= begin
+          config[:requeue_lambda]
+        end
+      end
+
     end
 
   end

data/lib/qwrapper/queues/rabbitmq.rb

@@ -1,49 +1,89 @@
 require 'bunny'
 require 'qwrapper/queues/base'
 
+
 module Qwrapper
 
   module Queues
 
     class RabbitMQ < Base
 
+      attr_reader :connection
+
       def subscribe(queue_name, options={}, &block)
+        ch = nil
         begin
-          logger.info "Subscribed to '#{queue_name}'"
-          queue = get_queue(queue_name, options)
+          logger.info "Subscribing to '#{queue_name}'"
+          ch = connection.create_channel
+          ch.prefetch(options[:prefetch] || 1)
+          queue = ch.queue(queue_name, options.merge(durable: true))
           queue.subscribe(ack: true, block: true) do |delivery_info, metadata, payload|
-            # TODO find unique way to identify a message and list that as part
-            # of the wrap message
             begin
               if logger.respond_to?(:wrap)
                 logger_wrapped_block_execution(payload, &block)
               else
                 block_execution(payload, &block)
               end
-            rescue *requeue_exceptions => ex
-              logger.error "Requeue logic"
-              logger.error ex
+            rescue *requeue_errors => ex
+              if requeue_lambda
+                requeue_lambda.call(queue_name, payload, ex)
+              else
+                logger.error "No requeue_lambda provided"
+                raise ex
+              end
             end
             queue.channel.ack(delivery_info.delivery_tag)
           end
-          connection.close if connection
         rescue Exception => ex
-          logger.error "TODO: What logic goes here?"
           logger.error ex
+        ensure
+          ch.close if ch
         end
       end
 
       def publish(queue_name, messages, options={})
-        messages = [messages] unless messages.is_a?(Array)
-        queue = get_queue(queue_name, options={})
-        messages.each do |message|
-          queue.publish(message.to_s, :persistent => true)
+        ch = nil
+        begin
+          logger.info "Publishing to '#{queue_name}'"
+          messages = [messages] unless messages.is_a?(Array)
+          messages.flatten!
+          if messages.count > 0
+            ch = connection.create_channel
+            ch.prefetch(options[:prefetch] || 1)
+            queue = ch.queue(queue_name, options.merge(durable: true))
+            messages.each do |message|
+              queue.publish(message.to_s, :persistent => true)
+            end
+          end
+        rescue Exception => ex
+          logger.error ex
+        ensure
+          ch.close if ch
         end
+      end
+
+      def connect!
+        connection.start if connection
+      end
+
+      def disconnect!
         connection.close if connection
       end
 
     private
 
+      def connection
+        @conn ||= begin
+          c = Bunny.new({
+            host: config[:host] || "localhost",
+            port: config[:port] || 5672,
+            logger: dup_logger,
+            keepalive: config[:keepalive] || true
+          })
+          c.start
+        end
+      end
+
       def logger_wrapped_block_execution(payload, &block)
         logger.wrap("SubscribedMessage") do |nested_logger|
           block.call(payload, nested_logger)
@@ -54,29 +94,6 @@ module Qwrapper
         block.call(payload, logger)
       end
 
-      def get_queue(queue_name, options={})
-        ch = connection.create_channel
-        ch.prefetch(config[:prefetch] || 1)
-        ch.queue(queue_name, options.merge(durable: true))
-      end
-
-      def connection
-        #@conn ||= begin
-          Bunny.new(connection_details).tap do |c|
-            c.start
-          end
-        #end
-      end
-
-      def connection_details
-        {
-          host: config[:host] || "localhost",
-          port: config[:port] || 5672,
-          logger: dup_logger,
-          keepalive: config[:keepalive] || true
-        }
-      end
-
       def dup_logger
         logger.respond_to?(:duplicate) ? logger.duplicate("bunny") : logger
       end

data/lib/qwrapper/version.rb

@@ -1,3 +1,3 @@
 module Qwrapper
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nirmit Patel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler