carnivore 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df028b8724cf4c5392538b3c6f9b36615c2f1b0e
-  data.tar.gz: 5b9eb357bf2357f57a7d41fa6d44a3fe01374d85
+  metadata.gz: 488354b5c88ba4e3992fa4ee8ec6b81c42e52ef2
+  data.tar.gz: 0b33704a653ae60d4733fd1a3bb4b4b98d420196
 SHA512:
-  metadata.gz: 74081290aa5c3469e05c7bc5f0bb3369152e695dd45c8bc962efb5da39bf0eaaa70b31d5185c8691d2734943d424da7c1bd8e53b18d3bffc9003977ad3d6d051
-  data.tar.gz: 16243f3f57017e037b4788843a8ee942b6905ca2dee703b91276d2205940a6afcc873642003eed92b80d820e2fdaa93f2e0f87abfe3034749d38010dae5281c7
+  metadata.gz: d5da72980c4bd8d3ee3b99a1348f264008a9dd0ab1549da85ac43ad215772152a38f6b1f54b583f12959a1e72a78bf61f3dfe5533a709595decc65a308b91171
+  data.tar.gz: a24fb16e43b8ffa06c6f3e50495c93b4756ba9b7c9a21f0f9f46aa458ee4c05ca1fd8e933096032b6854951513536bd684e41705d971ef591bb450bef3aa3355

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.12
+* Prevent source configuration output at INFO level on build
+* Keep all sources paused until all sources are built
+* Add helper for performing hash conversions
+* Support deep hash conversions (process through enumerables)
+
 # v0.2.10
 * Remove explicit JSON usage
 

data/lib/carnivore/callback.rb

@@ -12,6 +12,8 @@ module Carnivore
     include Celluloid
     include Carnivore::Utils::Logging
     # @!parse include Carnivore::Utils::Logging
+    include Carnivore::Utils::Failure
+    # @!parse include Carnivore::Utils::Failure
 
     # @return [String, Symbol] name of callback
     attr_reader :name
@@ -30,7 +32,9 @@ module Carnivore
         raise ArgumentError.new 'Block is required for dynamic callbacks!'
       end
       define_singleton_method(:execute, &block) if block
-      setup
+      execute_and_retry_forever(:setup) do
+        setup
+      end
     end
 
     # Used by custom callback classes for setup

data/lib/carnivore/runner.rb

@@ -19,13 +19,24 @@ module Carnivore
       begin
         require 'carnivore/supervisor'
         supervisor = Carnivore::Supervisor.build!
+        Celluloid::Logger.info 'Initializing all registered sources.'
+        [].tap do |register|
+          Source.sources.each do |source|
+            register << Thread.new do
+              source.klass.reset_comms!
+              supervisor.supervise_as(
+                source.source_hash[:name],
+                source.klass,
+                source.source_hash.dup
+              )
+            end
+          end
+        end.map(&:join)
+        Celluloid::Logger.info 'Source initializations complete. Enabling message processing.'
         Source.sources.each do |source|
-          source.klass.reset_comms!
-          supervisor.supervise_as(
-            source.source_hash[:name],
-            source.klass,
-            source.source_hash.dup
-          )
+          if(source.source_hash.fetch(:auto_process, true))
+            supervisor[source.source_hash[:name]].start!
+          end
         end
         loop do
           # We do a sleep loop so we can periodically check on the

data/lib/carnivore/source.rb

@@ -98,6 +98,8 @@ module Carnivore
     include Celluloid
     include Utils::Logging
     # @!parse include Carnivore::Utils::Logging
+    include Utils::Failure
+    # @!parse include Carnivore::Utils::Failure
 
     finalizer :teardown_cleanup
 
@@ -171,12 +173,11 @@ module Carnivore
           add_callback(name, block)
         end
       end
-      setup(args)
-      connect
-      if(auto_process && !callbacks.empty?)
-        async.process
-      else
-        warn 'Processing is disabled'
+      execute_and_retry_forever(:setup) do
+        setup(args)
+      end
+      execute_and_retry_forever(:connect) do
+        connect
       end
       info 'Source initialization is complete'
     rescue => e
@@ -184,6 +185,25 @@ module Carnivore
       raise
     end
 
+    # Start source if auto_process is enabled
+    #
+    # @return [TrueClass, FalseClass]
+    def start!
+      if(auto_process?)
+        info 'Message processing started via auto start'
+        async.process
+        true
+      else
+        warn 'Message processing is disabled via auto start'
+        false
+      end
+    end
+
+    # @return [TrueClass, FalseClass] auto processing enabled
+    def auto_process?
+      auto_process && !callbacks.empty?
+    end
+
     # Ensure we cleanup our internal supervisor before bailing out
     def teardown_cleanup
       warn 'Termination request received. Tearing down!'
@@ -335,47 +355,51 @@ module Carnivore
     # @param args [Object] list of arguments
     # @return [TrueClass]
     def process(*args)
-      begin
-        async.receive_messages
-        @processing = true
-        while(run_process && !callbacks.empty?)
-          if(message_loop.empty? && message_remote.empty?)
-            wait(:messages_available)
-          end
-          msgs = []
-          msgs.push message_loop.pop unless message_loop.empty?
-          msgs.push message_remote.pop unless message_remote.empty?
-          msgs = [msgs].flatten.compact.map do |m|
-            if(valid_message?(m))
-              format(m)
+      unless(processing)
+        begin
+          async.receive_messages
+          @processing = true
+          while(run_process && !callbacks.empty?)
+            if(message_loop.empty? && message_remote.empty?)
+              wait(:messages_available)
             end
-          end.compact
-          msgs.each do |msg|
-            if(multiple_callbacks? || respond_to?(:orphan_callback))
-              valid_callbacks = callbacks.find_all do |name|
-                callback_supervisor[callback_name(name)].valid?(msg)
+            msgs = []
+            msgs.push message_loop.pop unless message_loop.empty?
+            msgs.push message_remote.pop unless message_remote.empty?
+            msgs = [msgs].flatten.compact.map do |m|
+              if(valid_message?(m))
+                format(m)
               end
-            else
-              valid_callbacks = callbacks
-            end
-            if(valid_callbacks.empty?)
-              warn "Received message was not processed through any callbacks on this source: #{msg}"
-              orphan_callback(msg) if respond_to?(:orphan_callback)
-            elsif(valid_callbacks.size > 1 && !multiple_callbacks?)
-              error "Received message is valid for multiple callbacks but multiple callbacks are disabled: #{msg}"
-              multiple_callback(msg) if respond_to?(:multiple_callback)
-            else
-              valid_callbacks.each do |name|
-                debug "Dispatching message<#{msg[:message].object_id}> to callback<#{name} (#{callback_name(name)})>"
-                callback_supervisor[callback_name(name)].async.call(msg)
+            end.compact
+            msgs.each do |msg|
+              if(multiple_callbacks? || respond_to?(:orphan_callback))
+                valid_callbacks = callbacks.find_all do |name|
+                  callback_supervisor[callback_name(name)].valid?(msg)
+                end
+              else
+                valid_callbacks = callbacks
+              end
+              if(valid_callbacks.empty?)
+                warn "Received message was not processed through any callbacks on this source: #{msg}"
+                orphan_callback(msg) if respond_to?(:orphan_callback)
+              elsif(valid_callbacks.size > 1 && !multiple_callbacks?)
+                error "Received message is valid for multiple callbacks but multiple callbacks are disabled: #{msg}"
+                multiple_callback(msg) if respond_to?(:multiple_callback)
+              else
+                valid_callbacks.each do |name|
+                  debug "Dispatching message<#{msg[:message].object_id}> to callback<#{name} (#{callback_name(name)})>"
+                  callback_supervisor[callback_name(name)].async.call(msg)
+                end
               end
             end
           end
+        ensure
+          @processing = false
         end
-      ensure
-        @processing = false
+        true
+      else
+        false
       end
-      true
     end
 
     # Receive messages from source

data/lib/carnivore/utils.rb

@@ -8,6 +8,7 @@ module Carnivore
     autoload :Logging, 'carnivore/utils/logging'
     autoload :MessageRegistry, 'carnivore/utils/message_registry'
     autoload :Smash, 'carnivore/utils/smash'
+    autoload :Failure, 'carnivore/utils/failure'
 
     extend Params
     extend Logging

data/lib/carnivore/utils/failure.rb

@@ -0,0 +1,31 @@
+require 'carnivore'
+
+module Carnivore
+  module Utils
+
+    # Failure utilities
+    module Failure
+
+      # Attempt to execute provided block. If exception is raised, log
+      # and pause before retry. Do this until success.
+      #
+      # @param action [String, Symbol] display name for block
+      # @return [Object] result of yielded block
+      def execute_and_retry_forever(action)
+        begin
+          debug "Starting #{action} process"
+          result = yield
+          debug "Completed #{action} process"
+          result
+        rescue => e
+          error "#{action.to_s.capitalize} process encountered an error: #{e.class} - #{e}"
+          debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+          warn "Pausing for 5 seconds then retrying #{action}"
+          sleep(5)
+          retry
+        end
+      end
+
+    end
+  end
+end

data/lib/carnivore/utils/smash.rb

@@ -75,6 +75,13 @@ module Carnivore
         value
       end
 
+      # Convert to Hash
+      #
+      # @return [Hash]
+      def to_hash
+        self.to_type_converter(::Hash, :to_hash)
+      end
+
     end
   end
 
@@ -87,13 +94,42 @@ class Hash
   #
   # @return [Smash]
   def to_smash
-    ::Smash.new.tap do |smash|
+    self.to_type_converter(::Smash, :to_smash)
+  end
+  alias_method :hulk_smash, :to_smash
+
+  protected
+
+  # Convert to type
+  #
+  # @param type [Class] hash type
+  # @param convert_call [Symbol] builtin hash convert
+  # @return [Smash]
+  def to_type_converter(type, convert_call)
+    type.new.tap do |smash|
       self.each do |k,v|
-        smash[k.is_a?(Symbol) ? k.to_s : k] = v.is_a?(::Hash) && !v.is_a?(::Smash) ? v.to_smash : v
+        smash[k.is_a?(Symbol) ? k.to_s : k] = smash_conversion(v, convert_call)
       end
     end
   end
-  alias_method :hulk_smash, :to_smash
+
+  # Convert object to smash if applicable
+  #
+  # @param obj [Object]
+  # @param convert_call [Symbol] builtin hash convert
+  # @return [Smash, Object]
+  def smash_conversion(obj, convert_call)
+    case obj
+    when Hash
+      obj.send(convert_call)
+    when Array
+      obj.map do |i|
+        smash_conversion(i, convert_call)
+      end
+    else
+      obj
+    end
+  end
 
 end
 

data/lib/carnivore/version.rb

@@ -1,4 +1,4 @@
 module Carnivore
   # Current version of library
-  VERSION = Gem::Version.new('0.2.10')
+  VERSION = Gem::Version.new('0.2.12')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -88,6 +88,7 @@ files:
 - lib/carnivore/spec_helper.rb
 - lib/carnivore/supervisor.rb
 - lib/carnivore/utils.rb
+- lib/carnivore/utils/failure.rb
 - lib/carnivore/utils/logging.rb
 - lib/carnivore/utils/message_registry.rb
 - lib/carnivore/utils/params.rb