carnivore-nsq 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4b345b1301c64e24eb4c15c6dc47d2249805440
-  data.tar.gz: 15f27c1f613e2e3227e1efb244b4bd7104dc61e5
+  metadata.gz: 51426c18010c2c755db91d0ecc57de7c619252bc
+  data.tar.gz: ba0b5f24e32a1bc41b43f1ee8cadb3f4fa2b8d1c
 SHA512:
-  metadata.gz: 9db9010e58583ed20411820d53f1a032f376b6d4f96a87a15fcc16ff2efe267aeeee9a0c89abc6998b745d611aafe4c310792e772d678335ede6e7f8e9999edf
-  data.tar.gz: de4eacf46cc99d60c267317a3ec1c4225ee43f34837b48287f700bc4cb72f0359c2a718e3ddbc6d2ebf8777f57bed759315b6b18b2d75f31b3e0a6f55cd0a045
+  metadata.gz: 3e344591ee2ea0c053a1a6ece3bf8880dde978a7a329ea215b08a97a89842d0c1cd9249af2c0cf111dbf60eb90819d009cbeab5a02e682295dec2b1df02dbc54
+  data.tar.gz: 43718d3d9f797d829f1e9b8ea19ed95bfa5f86f4a0aaf09822308dab448578176403d3800022d343a775be9c87269b96b02cc5c72ff08d4faf974f979076e4ad

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.1.8
+* Do not rebuild consumer on general teardown
+* Log if message confirmation is not successful
+* Add Source#touch implementation
+
 ## v0.1.6
 * Link consumer to source. Auto rebuild consumer if death encountered.
 

data/lib/carnivore-nsq/nsq.rb

@@ -7,6 +7,7 @@ module Carnivore
 
       trap_exit :consumer_failure
 
+      # @return [String] default path for global lookupd configuration
       DEFAULT_LOOKUPD_PATH = '/etc/carnivore/nsq.json'
 
       attr_reader(
@@ -15,6 +16,9 @@ module Carnivore
         :waiter, :producer_args, :args
       )
 
+      # Setup the source
+      #
+      # @param args [Hash] setup arguments
       def setup(args={})
         @args = args.to_smash
         @lookupd = (default_lookupds + [args[:lookupd]]).flatten.compact.uniq
@@ -27,13 +31,23 @@ module Carnivore
         Krakow::Utils::Logging.level = (Carnivore::Config.get(:krakow, :logging, :level) || :info).to_sym
       end
 
-      def consumer_failure
-        warn 'Consumer failure detected. Forcing termination and rebuilding.'
-        @reader.terminate
-        build_consumer
-        info "Consumer connection for #{topic}:#{channel} re-established #{reader}"
+      # Process linked failure
+      #
+      # @param obj [Celluloid::Actor] failed actor
+      # @param exception [Exception] actor exception
+      def consumer_failure(obj, exception)
+        if(exception)
+          exclusive do
+            warn 'Consumer failure detected. Forcing termination and rebuilding.'
+            @reader.terminate
+            @reader = nil
+            build_consumer
+            info "Consumer connection for #{topic}:#{channel} re-established #{reader}"
+          end
+        end
       end
 
+      # Build the consumer connection
       def build_consumer
         consumer_args = Smash.new(
           :nsqlookupd => lookupd,
@@ -46,6 +60,7 @@ module Carnivore
         link @reader
       end
 
+      # Establish required connections (producer/consumer)
       def connect
         unless(callbacks.empty?)
           unless(lookupd.empty?)
@@ -73,34 +88,62 @@ module Carnivore
         end
       end
 
+      # @return [Krakow::Consumer]
       def consumer
         reader ||
           abort('Consumer is not established. No setup information provided!')
       end
 
+      # @return [Krakow::Consumer, Krakow::Consumer::Http]
       def producer
         writer ||
           abort('Producer is not established. No setup information provided!')
       end
 
-      def receive(n=1)
+      # Receive messages
+      #
+      # @return [String]
+      def receive(*_)
         if(consumer.queue.empty?)
           waiter.wait
         end
         msg = consumer.queue.pop
       end
 
+      # Send message
+      #
+      # @param payload [Object]
+      # @param original [Carnivore::Message
       def transmit(payload, original=nil)
         payload = MultiJson.dump(payload) unless payload.is_a?(String)
         producer.write(payload)
       end
 
+      # Confirm completion of message
+      #
+      # @param message [Carnivore::Message]
+      # @return [TrueClass, FalseClass]
       def confirm(message)
-        consumer.confirm(message[:message])
+        begin
+          unless(consumer.confirm(message[:message]))
+            error "Failed to confirm payload from source! (#{e})"
+          end
+        rescue Krakow::Error::LookupFailed => e
+          error "Failed to confirm payload from source! (#{e})"
+        end
+      end
+
+      # Touch message to extend lifetime
+      #
+      # @param message [Carnivore::Message]
+      # @return [TrueClass]
+      def touch(message)
+        message[:message].touch
       end
 
       private
 
+      # @return [Array<String>] default lookupd locations
       def default_lookupds
         json_path = args.fetch(:lookupd_file_path, DEFAULT_LOOKUPD_PATH)
         lookupds = nil

data/lib/carnivore-nsq/version.rb

@@ -1,6 +1,6 @@
 module Carnivore
   module Nsq
     # current library version
-    VERSION = Gem::Version.new('0.1.6')
+    VERSION = Gem::Version.new('0.1.8')
   end
 end

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-nsq
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Chris Roberts
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: krakow
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
-  prerelease: false
-  type: :runtime
 description: Carnivore NSQ source
 email: chrisroberts.code@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/carnivore-nsq.rb
-- lib/carnivore-nsq/nsq.rb
-- lib/carnivore-nsq/version.rb
-- carnivore-nsq.gemspec
-- README.md
 - CHANGELOG.md
 - CONTRIBUTING.md
 - LICENSE
+- README.md
+- carnivore-nsq.gemspec
+- lib/carnivore-nsq.rb
+- lib/carnivore-nsq/nsq.rb
+- lib/carnivore-nsq/version.rb
 homepage: https://github.com/carnivore-rb/carnivore-nsq
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Message processing helper
 test_files: []
-has_rdoc:
+has_rdoc: