carnivore-rabbitmq 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93bd64853af5442ac5ce62b73e1547c5690d630e
-  data.tar.gz: 3d10ed4dec1940e1f7ff2fa8afb74ba3a669be8d
+  metadata.gz: fde297db3cabbe62377e3277ac644df69c218b48
+  data.tar.gz: 5dfaa10d669f69b1958ea7244c6b8ab771a5ae95
 SHA512:
-  metadata.gz: b4ec13bef9a0ddf7bd965edb3a89d9db47131f0fcb5f9baaa49a70669fffb9d89b3ba76c0bb026811f5934bcbf492d13d1da2e41902b616d4582e47400c08b6d
-  data.tar.gz: 66072c609c57ab533696ff69a86ba857938cf3515dbc1e4f1b3a2cb41dba92ac191619bd153ac03d722a9311a0dcbd37161cd0afaa5bf7a8608ee8fe63072956
+  metadata.gz: 16514a62fc24f878951914bbdd245425271fd5638b65ca931feea8ebdd40c74f1c0bfa7ca94e154dff737d9ac295afbcf70cc4b614a53236d36e86888fd87f31
+  data.tar.gz: 1196c52b20fff49f4284fcd380151a86074e5b63125fbdfa9ba7b001c3bd47307b5e1cbbc075250608aada1c29abc1820f29f3fc5490c1bb2971b48c2836429a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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/message_collector.rb

@@ -12,22 +12,28 @@ module Carnivore
 
         # @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)
+        # @param notify [Zoidberg::Shell] actor to notify
+        def initialize(queue, notify)
           @queue = queue
-          @message_queue = message_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]
@@ -40,20 +46,20 @@ module Carnivore
             begin
               payload = MultiJson.load(payload).to_smash
             rescue MultiJson::ParseError
-              warn 'Received payload not in JSON format. Failed to parse!'
+              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}"
-            message_queue << Smash.new(
+            new_message = 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)
+            debug "Sending new message signal to: #{notify}"
+            notify.signal(:new_messages, new_message)
           end
           true
         end

data/lib/carnivore-rabbitmq/rabbitmq.rb

@@ -6,6 +6,8 @@ module Carnivore
     # RabbitMQ based carnivore source
     class Rabbitmq < Source
 
+      option :cache_signals
+
       autoload :MessageCollector, 'carnivore-rabbitmq/message_collector'
 
       # @return [Smash] initialization arguments
@@ -20,8 +22,6 @@ module Carnivore
       attr_reader :queue
       # @return [String] routing key
       attr_reader :routing_key
-      # @return [Queue] message queue
-      attr_reader :message_queue
       # @return [Carnviore::Source::Rabbitmq::MessageCollector] message collector
       attr_reader :message_collector
 
@@ -33,9 +33,7 @@ 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}>"
@@ -49,27 +47,15 @@ module Carnivore
       # 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
+          @message_collector = MessageCollector.new(queue, current_actor)
+          message_collector.start!
         end
       end
 
       # Destroy message collector
       #
       # @return [TrueClass]
-      def collector_teardown
+      def terminate
         connection.close if connection
         if(message_collector && message_collector.alive?)
           message_collector.terminate
@@ -109,10 +95,7 @@ module Carnivore
       # @return [Hash] payload
       def receive(*_)
         start_collector
-        while(message_queue.empty?)
-          wait(:new_messages)
-        end
-        message_queue.pop
+        wait(:new_messages)
       end
 
       # Transmit payload to connection

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.2')
   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.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny