carnivore-rabbitmq 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde297db3cabbe62377e3277ac644df69c218b48
-  data.tar.gz: 5dfaa10d669f69b1958ea7244c6b8ab771a5ae95
+  metadata.gz: cd27cd6d1b8b40b91acb44542e25092e30fb43d0
+  data.tar.gz: 714920300aee91b2abe11fbf31a9de62d6f30766
 SHA512:
-  metadata.gz: 16514a62fc24f878951914bbdd245425271fd5638b65ca931feea8ebdd40c74f1c0bfa7ca94e154dff737d9ac295afbcf70cc4b614a53236d36e86888fd87f31
-  data.tar.gz: 1196c52b20fff49f4284fcd380151a86074e5b63125fbdfa9ba7b001c3bd47307b5e1cbbc075250608aada1c29abc1820f29f3fc5490c1bb2971b48c2836429a
+  metadata.gz: af4c659d59915ea6ff1a338dd110b74c6ba4a2dd49de9f641623fe9811ae82c1a526effcc3cce03ece0bf88f172c9855e8cf2b0e505195b1c545686567598688
+  data.tar.gz: b04f5248ee265729faaf9b0f1ac60b7b8835d8acc1c3f0e9a4d9b55de7291decee9c052e632d2f5275095c8a4a58ad26da1292ef921a727ffb59ea250cc2843a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.4
+* Refactor to isolate connection to ease supervision
+* Push received messages via internal signaling
+
 # v0.2.2
 * Transfer messages via internal signal
 * Properly cleanup on termination

data/lib/carnivore-rabbitmq/connection.rb

@@ -0,0 +1,134 @@
+require 'carnivore-rabbitmq'
+
+module Carnivore
+  class Source
+    class Rabbitmq
+      # RabbitMQ connection
+      class Connection
+
+        include Zoidberg::SoftShell
+        include Zoidberg::Supervise
+        include Carnivore::Utils::Logging
+
+        # @return [Hash]
+        attr_reader :source_args
+        # @return [String]
+        attr_reader :routing_key
+        # @return [Bunny::Connection, MarchHare::Connection]
+        attr_reader :connection
+        # @return [Bunny::Channel, MarchHare::Channel]
+        attr_reader :channel
+        # @return [Bunny::Exchange, MarchHare::Exchange]
+        attr_reader :exchange
+        # @return [Bunny::Queue, MarchHare::Queue]
+        attr_reader :queue
+        # @return [Carnivore::Source::Rabbitmq]
+        attr_reader :source
+        # @return [Queue]
+        attr_reader :message_queue
+        # @return [Signal]
+        attr_reader :source_signal
+
+        # Create new connection
+        #
+        # @param r_source [Carnivore::Source::Rabbitmq] origin
+        # @param m_queue [Queue] common message queue
+        # @return [self]
+        def initialize(r_source, m_queue)
+          @source = r_source
+          @source_args = r_source.args.to_smash
+          @message_queue = m_queue
+          connect
+        end
+
+        # Restart trigger for supervised replacements
+        def restarted
+          connect
+          if(source.collect_messages)
+            async.receive_messages
+          end
+        end
+
+        # Establish connection to remote server and setup
+        #
+        # @return [MarchHare::Session, Bunny::Session]
+        def connect
+          unless(source_args[:connection])
+            abort KeyError.new "No configuration defined for connection type (#{connection_library})"
+          end
+          connection_args = Carnivore::Utils.symbolize_hash(source_args[:connection])
+          case connection_library
+          when :bunny
+            require 'bunny'
+            @connection = Bunny.new(connection_args)
+          when :march_hare
+            require 'march_hare'
+            @connection = MarchHare.connect(connection_args)
+          else
+            abort ArgumentError.new("No valid connection arguments defined (:bunny or :march_hare must be defined)")
+          end
+          connection.start
+          @routing_key = source_args[:routing_key]
+          @channel = connection.create_channel
+          @exchange = channel.topic(source_args[:exchange])
+          @queue = channel.queue(source_args[:queue], :auto_delete => false).
+            bind(exchange, :routing_key => routing_key)
+          @connection
+        end
+
+        # Write message to connection
+        #
+        # @param payload [String]
+        def write(payload)
+          if(source_args[:publish_via].to_s == 'exchange')
+            exchange.publish(payload, :routing_key => routing_key)
+          else
+            queue.publish(payload, :routing_key => routing_key)
+          end
+        end
+
+        # Send message acknowledgement
+        #
+        # @param tag [String]
+        def ack(tag)
+          channel.acknowledge(tag, false)
+        end
+
+        # Start receiving message
+        def receive_messages
+          queue.subscribe(:block => true, :manual_ack => true) do |info, metadata, payload|
+            if(payload.nil?)
+              payload = metadata
+              metadata = {}
+            end
+            begin
+              payload = MultiJson.load(payload).to_smash
+            rescue MultiJson::ParseError
+              debug 'Received payload not in JSON format. Failed to parse!'
+            end
+            new_message = Smash.new(
+              :raw => Smash.new(
+                :info => info,
+                :metadata => metadata
+              ),
+              :content => payload
+            )
+            debug "<#{source}> New message: #{new_message}"
+            source.signal(:new_message, new_message)
+          end
+          true
+        end
+
+        # @return [Symbol] connection library to utilize
+        def connection_library
+          if(source_args[:force_library])
+            source_args[:force_library].to_sym
+          else
+            RUBY_PLATFORM == 'java' ? :march_hare : :bunny
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/carnivore-rabbitmq/rabbitmq.rb

@@ -8,22 +8,16 @@ module Carnivore
 
       option :cache_signals
 
-      autoload :MessageCollector, 'carnivore-rabbitmq/message_collector'
+      autoload :Connection, 'carnivore-rabbitmq/connection'
 
       # @return [Smash] initialization arguments
       attr_reader :args
-      # @return [MarchHare::Session, Bunny::Session] current connection
+      # @return [Connection] current connection
       attr_reader :connection
-      # @return [MarchHare::Exchange, Bunny::Exchange] current exchange
-      attr_reader :exchange
-      # @return [MarchHare::Channel, Bunny::Channel] current channel
-      attr_reader :channel
-      # @return [MarchHare::Queue, Bunny::Queue] current queue
-      attr_reader :queue
-      # @return [String] routing key
-      attr_reader :routing_key
-      # @return [Carnviore::Source::Rabbitmq::MessageCollector] message collector
-      attr_reader :message_collector
+      # @return [Queue]
+      attr_reader :message_queue
+      # @return [TrueClass, FalseClass]
+      attr_reader :collect_messages
 
       # RabbitMQ source setup
       #
@@ -34,79 +28,43 @@ module Carnivore
       # @option init_args [String, Symbol] :force_library :bunny or :march_hare
       def setup(init_args={})
         @args = args.dup
-        @queue_name = args[:queue]
-        @exchange_name = args[:exchange]
+        @message_queue = Queue.new
         debug "Creating Rabbitmq source instance <#{name}>"
       end
 
       # Connect to the remote server
       def connect
-        establish_connection
-      end
-
-      # Start the message collection
-      def start_collector
-        unless(@collecting)
-          @message_collector = MessageCollector.new(queue, current_actor)
-          message_collector.start!
-        end
+        @connection = Connection.new(current_self, message_queue)
       end
 
       # Destroy message collector
       #
       # @return [TrueClass]
       def terminate
-        connection.close if connection
-        if(message_collector && message_collector.alive?)
-          message_collector.terminate
+        super
+        if(connection && connection.alive?)
+          connection.terminate
         end
-        true
-      end
-
-      # Establish connection to remote server and setup
-      #
-      # @return [MarchHare::Session, Bunny::Session]
-      def establish_connection
-        unless(args[:connection])
-          abort KeyError.new "No configuration defined for connection type (#{connection_library})"
-        end
-        connection_args = Carnivore::Utils.symbolize_hash(args[:connection])
-        case connection_library
-        when :bunny
-          require 'bunny'
-          @connection = Bunny.new(connection_args)
-        when :march_hare
-          require 'march_hare'
-          @connection = MarchHare.connect(connection_args)
-        else
-          abort ArgumentError.new("No valid connection arguments defined (:bunny or :march_hare must be defined)")
-        end
-        connection.start
-        @routing_key = args[:routing_key]
-        @channel = connection.create_channel
-        @exchange = channel.topic(args[:exchange])
-        @queue = channel.queue(args[:queue], :auto_delete => false).
-          bind(exchange, :routing_key => routing_key)
-        @connection
       end
 
       # Receive payload from connection
       #
       # @return [Hash] payload
       def receive(*_)
-        start_collector
-        wait(:new_messages)
+        unless(collect_messages)
+          @collect_messages = true
+          connection.async.receive_messages
+        end
+        wait(:new_message)
       end
 
       # Transmit payload to connection
       #
       # @param payload [Object]
       def transmit(payload, *_)
-        payload = MultiJson.dump(payload) unless payload.is_a?(String)
-        if(args[:publish_via].to_s == 'exchange')
-          exchange.publish(payload, :routing_key => routing_key)
-        else
-          queue.publish(payload, :routing_key => routing_key)
+        defer do
+          payload = MultiJson.dump(payload) unless payload.is_a?(String)
+          connection.write(payload)
         end
       end
 
@@ -114,16 +72,9 @@ module Carnivore
       #
       # @param message [Carnivore::Message]
       def confirm(message)
-        info "Confirming message #{message}"
-        channel.acknowledge(message[:message][:info].delivery_tag, false)
-      end
-
-      # @return [Symbol] connection library to utilize
-      def connection_library
-        if(args[:force_library])
-          args[:force_library].to_sym
-        else
-          RUBY_PLATFORM == 'java' ? :march_hare : :bunny
+        defer do
+          info "Confirming message #{message}"
+          connection.ack(message[:message][:info].delivery_tag)
         end
       end
 

data/lib/carnivore-rabbitmq/version.rb

@@ -1,6 +1,6 @@
 module Carnivore
   module Rabbitmq
     # Current version of library
-    VERSION = Gem::Version.new('0.2.2')
+    VERSION = Gem::Version.new('0.2.4')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -83,7 +83,7 @@ files:
 - LICENSE
 - README.md
 - lib/carnivore-rabbitmq.rb
-- lib/carnivore-rabbitmq/message_collector.rb
+- lib/carnivore-rabbitmq/connection.rb
 - lib/carnivore-rabbitmq/rabbitmq.rb
 - lib/carnivore-rabbitmq/version.rb
 homepage: https://github.com/heavywater/carnivore-rabbitmq

data/lib/carnivore-rabbitmq/message_collector.rb

@@ -1,70 +0,0 @@
-require 'carnivore-rabbitmq'
-
-module Carnivore
-  class Source
-    class Rabbitmq
-      # Message collector
-      class MessageCollector
-
-        include Zoidberg::SoftShell
-        include Zoidberg::Supervise
-        include Carnivore::Utils::Logging
-
-        # @return [Bunny::Queue, MarchHare::Queue] remote queue
-        attr_reader :queue
-        # @return [Celluloid::Actor] actor to notify
-        attr_reader :notify
-
-        # Create new instance
-        #
-        # @param queue [Bunny::Queue, MarchHare::Queue] remote queue
-        # @param notify [Zoidberg::Shell] actor to notify
-        def initialize(queue, notify)
-          @queue = queue
-          @notify = notify
-        end
-
-        # Start message collection when restarted
-        def restarted
-          start!
-        end
-
-        # Start the collector
-        def start!
-          current_self.async.collect_messages
-        end
-
-        # Collect messages from remote queue
-        #
-        # @return [TrueClass]
-        def collect_messages
-          queue.subscribe(:block => true, :manual_ack => true) do |info, metadata, payload|
-            if(payload.nil?)
-              payload = metadata
-              metadata = {}
-            end
-            begin
-              payload = MultiJson.load(payload).to_smash
-            rescue MultiJson::ParseError
-              debug 'Received payload not in JSON format. Failed to parse!'
-            end
-            debug "Message received: #{payload.inspect}"
-            debug "Message info: #{info.inspect}"
-            debug "Message metadata: #{metadata.inspect}"
-            new_message = Smash.new(
-              :raw => Smash.new(
-                :info => info,
-                :metadata => metadata
-              ),
-              :content => payload
-            )
-            debug "Sending new message signal to: #{notify}"
-            notify.signal(:new_messages, new_message)
-          end
-          true
-        end
-
-      end
-    end
-  end
-end