carnivore-rabbitmq 0.2.0-java → 0.2.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 298cf52b218557db5decfb95a85beb9bdeaacd17
-  data.tar.gz: ad3b7d8ff53ceca3f13a4740a41884be812eb29c
+  metadata.gz: 9f5fc692f14f0a0c7cfdbc5b2e52fb0d10bfa3b6
+  data.tar.gz: 6c8f159c84d001fd8f98e61d36838bdcab77f4f5
 SHA512:
-  metadata.gz: f2e07e8e1fe357ff2721bf08505c07b1227cb4289acc1784bcfece31038ca2521fd7548fba376fe3770dce4d477de39103aa9c30adeef98668c06694a5d2c680
-  data.tar.gz: f1f7de50e2f5c6106c1a2a7704c8ac815bb6003f9215402ec552c1c2f362aa49a236ee147c4f03bfa975dcd1280fded075e7f364fb2147d259a3d571c4720588
+  metadata.gz: 8ff6f5f569b0701ec4456781f50eb1917569a8a1e069dd7e5ad6b7f97e5290adbf64a966a6a92473efefbb037b6268dd4dd329b49acfe7fb5ae49f7388257cc7
+  data.tar.gz: c1133b8bf9f5e9097326830cf674d602e1d2278b595fdfa9bf42d00db4044064450d872ce1084cd4fd35ee6cdcca08ce866133ffe671e1071fbd8c8d669d761b

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# v0.2.8
+* Ensure custom connection is always killed
+* Close remote connection on termination
+
+# v0.2.6
+* Kill connection to server when terminated
+
+# 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
+* Cache signals on source
+
 # v0.2.0
 * Update for latest carnivore
 

data/lib/carnivore-rabbitmq/connection.rb

@@ -0,0 +1,139 @@
+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
+
+        # Close down the connection if available
+        def terminate
+          connection.close
+        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

@@ -6,24 +6,18 @@ module Carnivore
     # RabbitMQ based carnivore source
     class Rabbitmq < Source
 
-      autoload :MessageCollector, 'carnivore-rabbitmq/message_collector'
+      option :cache_signals
+
+      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 [Queue] message queue
+      # @return [Queue]
       attr_reader :message_queue
-      # @return [Carnviore::Source::Rabbitmq::MessageCollector] message collector
-      attr_reader :message_collector
+      # @return [TrueClass, FalseClass]
+      attr_reader :collect_messages
 
       # RabbitMQ source setup
       #
@@ -33,97 +27,42 @@ module Carnivore
       # @option init_args [Hash] :connection configuration hash for connection
       # @option init_args [String, Symbol] :force_library :bunny or :march_hare
       def setup(init_args={})
-        require 'carnivore-rabbitmq/message_collector'
         @args = args.dup
         @message_queue = Queue.new
-        @queue_name = args[:queue]
-        @exchange_name = args[:exchange]
         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)
-          @collecting = true
-          @message_collector = MessageCollector.new(queue, message_queue, current_actor)
-          message_collector.async.collect_messages
-        end
-      end
-
-      # Restart collector if unexpectedly failed
-      #
-      # @param object [Actor] crashed actor
-      # @param reason [Exception, NilClass]
-      def collector_failure(object, reason)
-        if(reason && object == message_collector)
-          error "Message collector unexpectedly failed: #{reason} (restarting)"
-          start_collector
-        end
+        @connection = Connection.new(current_self, message_queue)
       end
 
       # Destroy message collector
       #
       # @return [TrueClass]
-      def collector_teardown
-        connection.close if connection
-        if(message_collector && message_collector.alive?)
-          message_collector.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
+      def terminate
+        super
+        connection.terminate
       end
 
       # Receive payload from connection
       #
       # @return [Hash] payload
       def receive(*_)
-        start_collector
-        while(message_queue.empty?)
-          wait(:new_messages)
+        unless(collect_messages)
+          @collect_messages = true
+          connection.async.receive_messages
         end
-        message_queue.pop
+        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
 
@@ -131,16 +70,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.0')
+    VERSION = Gem::Version.new('0.2.8')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.8
 platform: java
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: march_hare
@@ -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,64 +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 [Queue] local message bucket
-        attr_reader :message_queue
-        # @return [Celluloid::Actor] actor to notify
-        attr_reader :notify
-
-        # Create new instance
-        #
-        # @param queue [Bunny::Queue, MarchHare::Queue] remote queue
-        # @param message_queue [Queue] local message bucket
-        # @param notify [Celluloid::Actor] actor to notify
-        def initialize(queue, message_queue, notify)
-          @queue = queue
-          @message_queue = message_queue
-          @notify = notify
-        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
-              warn '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}"
-            message_queue << Smash.new(
-              :raw => Smash.new(
-                :info => info,
-                :metadata => metadata
-              ),
-              :content => payload
-            )
-            debug "Sending new messages signal to: #{notify} (current queue size: #{message_queue.size})"
-            notify.signal(:new_messages)
-          end
-          true
-        end
-
-      end
-    end
-  end
-end