carnivore 0.3.16 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af038d704eaaa96651e9170f015c5174b2cb3a78
-  data.tar.gz: e5605c202c66d2396aaef1e09986d1f11463a8ce
+  metadata.gz: f7b86794cbfbbd6c6e4516b0050eaebdc7b3786b
+  data.tar.gz: 8587ef4f157a853b54916332fca60486555a6050
 SHA512:
-  metadata.gz: 00a52163a640a92f882cce6c3dba09eee1255223988c02fbbfb4b20625513ef5afc21cf39c26bd1a7425903d3c59c8a866de6d9060c25c46d0fe438c0ea1b16b
-  data.tar.gz: fc28ee9b8f042397a03a341d138e6fa83a9417643bb4d45ef8efae222ce17174902a945ef67b3ea28aafca1fbef8aefde2a94443455beb16d296237a437c6ffb
+  metadata.gz: b967f7dde24ea19e0ab8d1d94073afefac43cf5eb4c00cd460ae99a74dc2a5cee0b9a9b3f648737c21a020b8c25cb372116710a3f0e13539bc83c41785df50f8
+  data.tar.gz: 8e145e07ba5d343a0f09c56ad807871286a9de58e8595dc9c284f001ba9841f939c0d52d9e5a3c6878a22b97b0a7b8209266ad14c6c471e14ee11805cb74934d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v1.0.0
+* Remove celluloid, add zoidberg
+
 # v0.3.16
 * Explicit celluloid constraint due to breaking changes in 0.16.1
 * Disable support for local loop back (not currently used)

data/carnivore.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.description = 'Message processing helper'
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
-  s.add_dependency 'celluloid', '0.16.0'
-  s.add_dependency 'bogo-config'
-  s.add_dependency 'multi_json'
-  s.add_dependency 'hashie'
+  s.add_runtime_dependency 'bogo-config'
+  s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'hashie'
+  s.add_runtime_dependency 'zoidberg', '< 1.0'
   s.files = Dir['lib/**/*'] + %w(carnivore.gemspec README.md CHANGELOG.md)
 end

data/lib/carnivore.rb

@@ -1,7 +1,8 @@
 # Load supporters on demand
-autoload :Celluloid, 'celluloid'
 autoload :MultiJson, 'multi_json'
 
+require 'securerandom'
+require 'zoidberg'
 require 'bogo-config'
 require 'carnivore/runner'
 require 'carnivore/version'
@@ -11,9 +12,15 @@ module Carnivore
   autoload :Callback, 'carnivore/callback'
   autoload :Container, 'carnivore/container'
   autoload :Error, 'carnivore/errors'
+  autoload :Logger, 'carnivore/logger'
   autoload :Message, 'carnivore/message'
   autoload :Source, 'carnivore/source'
   autoload :Supervisor, 'carnivore/supervisor'
   autoload :Utils, 'carnivore/utils'
   autoload :Version, 'carnivore/version'
+
+  def self.uuid
+    Zoidberg.uuid
+  end
+
 end

data/lib/carnivore/callback.rb

@@ -9,7 +9,8 @@ module Carnivore
       attr_accessor :workers
     end
 
-    include Celluloid
+    include Zoidberg::SoftShell
+    include Zoidberg::Supervise
     include Carnivore::Utils::Logging
     # @!parse include Carnivore::Utils::Logging
     include Carnivore::Utils::Failure

data/lib/carnivore/container.rb

@@ -9,16 +9,16 @@ module Carnivore
 
     class << self
 
-      # @return [Celluloid::Logger]
+      # @return [Logger]
       def log
-        Celluloid::Logger
+        Carnivore::Utils::Logging::Logger
       end
 
     end
 
-    # @return [Celluloid::Logger]
+    # @return [Logger]
     def log
-      Celluloid::Logger
+      Carnivore::Utils::Logging::Logger
     end
 
   end

data/lib/carnivore/logger.rb

@@ -0,0 +1,5 @@
+require 'carnivore'
+
+module Carnivore
+  Logger = Zoidberg.logger
+end

data/lib/carnivore/runner.rb

@@ -43,7 +43,7 @@ module Carnivore
         require 'carnivore/supervisor'
         configure!(:verify)
         supervisor = Carnivore::Supervisor.build!
-        Celluloid::Logger.info 'Initializing all registered sources.'
+        Carnivore::Logger.info 'Initializing all registered sources.'
         [].tap do |register|
           Source.sources.each do |source|
             register << Thread.new do
@@ -55,7 +55,12 @@ module Carnivore
             end
           end
         end.map(&:join)
-        Celluloid::Logger.info 'Source initializations complete. Enabling message processing.'
+        Carnivore::Logger.info 'Source initializations complete. Running setup and establishing connections.'
+        Source.sources.each do |source|
+          supervisor[source.source_hash[:name]].run_setup
+          supervisor[source.source_hash[:name]].run_connect
+        end
+        Carnivore::Logger.info 'Sources setup and connected. Enabling message processing.'
         Source.sources.each do |source|
           if(source.source_hash.fetch(:auto_process, true))
             supervisor[source.source_hash[:name]].start!
@@ -65,23 +70,32 @@ module Carnivore
           # We do a sleep loop so we can periodically check on the
           # supervisor and ensure it is still alive. If it has died,
           # raise exception to allow cleanup and restart attempt
-          sleep Carnivore::Config.get(:carnivore, :supervisor, :poll) || 5 while supervisor.alive?
-          Celluloid::Logger.error 'Carnivore supervisor has died!'
+          gc_interval = Carnivore::Config.fetch(:carnivore, :garbage_interval, 30)
+          gc_last = Time.now.to_i
+          while(supervisor.alive?)
+            sleep Carnivore::Config.get(:carnivore, :supervisor, :poll) || 5
+            if(gc_interval && (Time.now.to_i - gc_last) > gc_interval)
+              Carnivore::Logger.debug 'Starting interval forced garbage collection from runner'
+              GC.start
+              gc_last = Time.now.to_i
+            end
+          end
+          Carnivore::Logger.error 'Carnivore supervisor has died!'
           raise Carnivore::Error::DeadSupervisor.new
         end
       rescue Carnivore::Error::DeadSupervisor
-        Celluloid::Logger.warn "Received dead supervisor exception. Attempting to restart."
+        Carnivore::Logger.warn "Received dead supervisor exception. Attempting to restart."
         begin
-          supervisor.terminate
+          supervisor.terminate if supervisor.alive?
         rescue => e
-          Celluloid::Logger.debug "Exception raised during supervisor termination (restart cleanup): #{e}"
+          Carnivore::Logger.debug "Exception raised during supervisor termination (restart cleanup): #{e}"
         end
-        Celluloid::Logger.debug "Pausing restart for 10 seconds to prevent restart thrashing cycles"
+        Carnivore::Logger.debug "Pausing restart for 10 seconds to prevent restart thrashing cycles"
         sleep 10
         retry
       rescue Exception => e
-        Celluloid::Logger.warn "Exception type encountered forcing shutdown - #{e.class}: #{e}"
-        Celluloid::Logger.debug "Shutdown exception info: #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+        Carnivore::Logger.warn "Exception type encountered forcing shutdown - #{e.class}: #{e}"
+        Carnivore::Logger.debug "Shutdown exception info: #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
         supervisor.terminate if supervisor
         # Gracefully shut down
       end

data/lib/carnivore/source.rb

@@ -27,7 +27,7 @@ module Carnivore
         require Source.require_path(args[:type]) || "carnivore/source/#{args[:type]}"
         klass = args[:type].to_s.split('_').map(&:capitalize).join
         klass = Source.const_get(klass)
-        args[:args][:name] ||= Celluloid.uuid
+        args[:args][:name] ||= Carnivore.uuid
         inst = SourceContainer.new(klass, args[:args])
         register(args[:args][:name], inst)
         inst
@@ -83,7 +83,7 @@ module Carnivore
         if(sources_registry[name])
           sources_registry[name]
         else
-          Celluloid.logger.error "Source lookup failed (name: #{name})"
+          Carnivore.logger.error "Source lookup failed (name: #{name})"
           abort KeyError.new("Requested named source is not registered: #{name}")
         end
       end
@@ -113,13 +113,14 @@ module Carnivore
 
     end
 
-    include Celluloid
+    include Zoidberg::SoftShell
+    include Zoidberg::Supervise
     include Utils::Logging
     # @!parse include Carnivore::Utils::Logging
     include Utils::Failure
     # @!parse include Carnivore::Utils::Failure
 
-    finalizer :teardown_cleanup
+#    finalizer :teardown_cleanup
 
     # @return [String, Symbol] name of source
     attr_reader :name
@@ -185,22 +186,37 @@ module Carnivore
         init_registry
       end
       @processing = false
-      @name = args[:name] || Celluloid.uuid
+      @name = args[:name] || Carnivore.uuid
       if(args[:callbacks])
         args[:callbacks].each do |name, block|
           add_callback(name, block)
         end
       end
+      info 'Source initialization is complete'
+    rescue => e
+      debug "Failed to initialize: #{self} - #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+      raise
+    end
+
+    # Fully restore the source if it is restarted
+    def restarted!
+      run_setup
+      run_connect
+      start!
+    end
+
+    # Run the source setup action
+    def run_setup
       execute_and_retry_forever(:setup) do
         setup(args)
       end
+    end
+
+    # Run the source connect action
+    def run_connect
       execute_and_retry_forever(:connect) do
         connect
       end
-      info 'Source initialization is complete'
-    rescue => e
-      debug "Failed to initialize: #{self} - #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
-      raise
     end
 
     # Start source if auto_process is enabled
@@ -223,13 +239,13 @@ module Carnivore
     end
 
     # Ensure we cleanup our internal supervisor before bailing out
-    def teardown_cleanup
+    def terminate
       warn 'Termination request received. Tearing down!'
       if(callback_supervisor && callback_supervisor.alive?)
         begin
           warn "Tearing down callback supervisor! (#{callback_supervisor})"
           callback_supervisor.terminate
-        rescue Celluloid::Task::TerminatedError
+        rescue Zoidberg::DeadException
           warn 'Terminated task error during callback supervisor teardown. Moving on.'
         end
       else

data/lib/carnivore/spec_helper.rb

@@ -1,8 +1,7 @@
 require 'carnivore'
-require 'celluloid'
 require 'minitest/autorun'
 
-Celluloid.logger.level = ENV['DEBUG'] ? 0 : 4
+Zoidberg.logger.level = ENV['DEBUG'] ? 0 : 4
 
 if(File.directory?(dir = File.join(Dir.pwd, 'test', 'specs')))
   Dir.glob(File.join(dir, '*.rb')).each do |path|
@@ -13,11 +12,6 @@ else
   exit -1
 end
 
-MiniTest::Spec.before do
-  Celluloid.shutdown
-  Celluloid.boot
-end
-
 # Simple waiter method to stall testing
 #
 # @param name [String, Symbol] fetch wait time from environment variable

data/lib/carnivore/supervisor.rb

@@ -1,8 +1,7 @@
 require 'carnivore'
-require 'celluloid/supervision_group'
 
 module Carnivore
-  class Supervisor < Celluloid::SupervisionGroup
+  class Supervisor < Zoidberg::Supervisor
 
     class << self
 
@@ -18,8 +17,8 @@ module Carnivore
       #
       # @return [Array<[Celluloid::Registry, Carnivore::Supervisor]>]
       def create!
-        registry = Celluloid::Registry.new
-        [registry, run!(registry)]
+        s = Zoidberg::Supervisor.new
+        [s.registry, s]
       end
 
       # Get/set the default supervisor
@@ -28,9 +27,9 @@ module Carnivore
       # @return [Carnivore::Supervisor]
       def supervisor(sup=nil)
         if(sup)
-          Celluloid::Actor[:carnivore_supervisor] = sup
+          @supervisor = sup
         end
-        Celluloid::Actor[:carnivore_supervisor]
+        @supervisor
       end
 
       # Get the registry of the default supervisor
@@ -49,11 +48,10 @@ module Carnivore
         if(supervisor)
           begin
             supervisor.terminate
-          rescue Celluloid::DeadActorError => e
-            Celluloid::Logger.warn "Default supervisor is already in dead state (#{e.class}: #{e})"
+          rescue Zoidberg::DeadException => e
+            Carnivore::Logger.warn "Default supervisor is already in dead state (#{e.class}: #{e})"
           end
           @supervisor = nil
-          @registry = nil
         end
         true
       end
@@ -66,17 +64,5 @@ module Carnivore
       end
 
     end
-
-    # @return [Celluloid::Registry]
-    attr_reader :registry
-
-    # Fetch actor from registry
-    #
-    # @param k [String, Symbol] identifier
-    # @return [Celluloid::Actor, NilClass]
-    def [](k)
-      registry[k]
-    end
-
   end
 end

data/lib/carnivore/utils/failure.rb

@@ -17,6 +17,8 @@ module Carnivore
           result = yield
           debug "Completed #{action} process"
           result
+        rescue Zoidberg::DeadException
+          raise
         rescue => e
           error "#{action.to_s.capitalize} process encountered an error: #{e.class} - #{e}"
           debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"

data/lib/carnivore/utils/logging.rb

@@ -19,10 +19,10 @@ module Carnivore
       # @return [NilClass]
       def log(*args)
         if(args.empty?)
-          Celluloid::Logger
+          Zoidberg.logger
         else
           severity, string = args
-          Celluloid::Logger.send(severity.to_sym, "#{self}: #{string}")
+          Zoidberg.logger.send(severity.to_sym, "#{self}: #{string}")
         end
       end
 

data/lib/carnivore/utils/message_registry.rb

@@ -4,6 +4,8 @@ module Carnivore
     # Registry used for preventing duplicate message processing
     class MessageRegistry
 
+      include Zoidberg::Shell
+
       # Create new instance
       def initialize
         @store = []

data/lib/carnivore/version.rb

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

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: bogo-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bogo-config
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: zoidberg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Message processing helper
 email: chrisroberts.code@gmail.com
 executables: []
@@ -80,6 +80,7 @@ files:
 - lib/carnivore/config.rb
 - lib/carnivore/container.rb
 - lib/carnivore/errors.rb
+- lib/carnivore/logger.rb
 - lib/carnivore/message.rb
 - lib/carnivore/runner.rb
 - lib/carnivore/source.rb