carnivore-nsq 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd3fa124723503789ab131c179d86e1379683177
-  data.tar.gz: f899df63a7dc27125d832c94f312a6042e6c6141
+  metadata.gz: d4b345b1301c64e24eb4c15c6dc47d2249805440
+  data.tar.gz: 15f27c1f613e2e3227e1efb244b4bd7104dc61e5
 SHA512:
-  metadata.gz: 63213f01a619dd2616d7be4a2021a6f43d5d28cbaf5969c05cde4a845503fd7019fa57113e9a91da6f79cab6ebdaf1d2a0017ffc09b2e35b06cf84ead73ae997
-  data.tar.gz: 46502119fa90efa6f6ad8ecebb5def185715552fd1fec07e88f22cf573f19c093fe53fee8be986a6f3c08b1369452f9776aab26964e9b1e80a42a801407c7e06
+  metadata.gz: 9db9010e58583ed20411820d53f1a032f376b6d4f96a87a15fcc16ff2efe267aeeee9a0c89abc6998b745d611aafe4c310792e772d678335ede6e7f8e9999edf
+  data.tar.gz: de4eacf46cc99d60c267317a3ec1c4225ee43f34837b48287f700bc4cb72f0359c2a718e3ddbc6d2ebf8777f57bed759315b6b18b2d75f31b3e0a6f55cd0a045

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.1.6
+* Link consumer to source. Auto rebuild consumer if death encountered.
+
 ## v0.1.4
 * Only start consumer if callbacks are registered
 * Update default max in flight and allow configuration from option

data/lib/carnivore-nsq/nsq.rb

@@ -5,6 +5,8 @@ module Carnivore
   class Source
     class Nsq < Source
 
+      trap_exit :consumer_failure
+
       DEFAULT_LOOKUPD_PATH = '/etc/carnivore/nsq.json'
 
       attr_reader(
@@ -25,18 +27,30 @@ 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}"
+      end
+
+      def build_consumer
+        consumer_args = Smash.new(
+          :nsqlookupd => lookupd,
+          :topic => topic,
+          :channel => channel,
+          :max_in_flight => args.fetch(:max_in_flight, 100),
+          :notifier => waiter
+        ).merge(reader_args)
+        @reader = Krakow::Consumer.new(consumer_args)
+        link @reader
+      end
+
       def connect
         unless(callbacks.empty?)
           unless(lookupd.empty?)
-            consumer_args = Smash.new(
-              :nsqlookupd => lookupd,
-              :topic => topic,
-              :channel => channel,
-              :max_in_flight => args.fetch(:max_in_flight, 100),
-              :notifier => waiter
-            ).merge(reader_args)
-            @reader = Krakow::Consumer.new(consumer_args)
-            info "Reader connection for #{topic}:#{channel} established #{reader}"
+            build_consumer
+            info "Consumer connection for #{topic}:#{channel} established #{reader}"
           end
         end
         if(producer_args)

data/lib/carnivore-nsq/version.rb

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

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-nsq
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Roberts
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: krakow
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !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:
-- CHANGELOG.md
-- CONTRIBUTING.md
-- LICENSE
-- README.md
-- carnivore-nsq.gemspec
 - lib/carnivore-nsq.rb
 - lib/carnivore-nsq/nsq.rb
 - lib/carnivore-nsq/version.rb
+- carnivore-nsq.gemspec
+- README.md
+- CHANGELOG.md
+- CONTRIBUTING.md
+- LICENSE
 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.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Message processing helper
 test_files: []
-has_rdoc: 
+has_rdoc: