carnivore-nsq 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e399157a914d9409adf05677cc934b54f4d3a9b6
-  data.tar.gz: 31c2b2bcbfd04ca660829e41aba0519e67956d21
+  metadata.gz: 700c179d22a74cd68a9fe8f3dbb0eada60fb714d
+  data.tar.gz: ebe7fad4aa9f113ec0c2da015219e0528824bf34
 SHA512:
-  metadata.gz: 657c05e4620f97360586a772857db9dd5b6c6298cce8b73d39b83346d3c2af5f7a62f6d9b8932e96159945ffc9cd95255a8da672458dbedf80d6fa914c42cc43
-  data.tar.gz: 86a14b6e8b833323dbc026342f70767a2333f9e20a333f092111da2ef9b75c7305c1cbfd510ef4b39cd8f33ebcc44ee59d629ab2312d7d7f84af4f4190dc84b2
+  metadata.gz: 73d5c47b4129593fb4d23a3c7529b8ec23b077c16d8aa702ec117553cf1a76fe6494d12eaf527ed48093273d5f7bb3ccdb376cb43c58b9c597fa52f950c9acc2
+  data.tar.gz: 46632fa13da1eb9c77ac3e6a7c0fe259ab8e467a2ab8d4b9fc0ef6c5c964ac579950ce8aa229333aba0cbabe527f57d43abc2bd408708e08317f40c7b7460ef2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.1.12
+* Add better connection recovery support
+
 ## v0.1.10
 * Clean up exit trapping implementation
 * Suppress exception errors on touch/lookup

data/lib/carnivore-nsq/nsq.rb

@@ -38,31 +38,22 @@ module Carnivore
       def trapper(obj, exception)
         if(exception)
           exclusive do
-            warn 'Consumer failure detected. Forcing termination and rebuilding.'
-            begin
-              @reader.terminate
-            rescue => e
-              warn "Consumer error suppressed on termination: #{e.class} - #{e}"
+            if(@reader && !@reader.alive?)
+              warn 'Consumer failure detected. Rebuilding.'
+              @reader = nil
+              build_consumer
+              info "Consumer connection for #{topic}:#{channel} re-established #{reader}"
             end
-            @reader = nil
-            build_consumer
-            info "Consumer connection for #{topic}:#{channel} re-established #{reader}"
-          end
-        else
-          if(@reader)
-            begin
-              @reader.terminate
-            rescue => e
-              warn "Consumer error suppressed on termination: #{e.class} - #{e}"
-            end
-          end
-          if(@writer)
-            begin
-              @writer.terminate
-            rescue => e
-              warn "Producer error suppressed on termination: #{e.class} - #{e}"
+            unless(@writer.alive?)
+              warn 'Producer failure detected. Rebuilding.'
+              @writer = nil
+              build_producer
+              info "Producer connection for #{topic} re-established #{writer}"
             end
           end
+        else
+          @writer.terminate if @writer.alive?
+          @reader.terminate if @reader.alive?
         end
       end
 
@@ -79,14 +70,8 @@ module Carnivore
         link @reader
       end
 
-      # Establish required connections (producer/consumer)
-      def connect
-        unless(callbacks.empty?)
-          unless(lookupd.empty?)
-            build_consumer
-            info "Consumer connection for #{topic}:#{channel} established #{reader}"
-          end
-        end
+      # Build the producer connection
+      def build_producer
         if(producer_args)
           @writer = Krakow::Producer.new(
             producer_args.merge(
@@ -96,6 +81,7 @@ module Carnivore
             )
           )
           info "Producer TCP connection for #{topic} established #{writer}"
+          link @writer
         elsif(http_transmit)
           @writer = Krakow::Producer::Http.new(
             Smash.new(
@@ -104,7 +90,19 @@ module Carnivore
             )
           )
           info "Producer HTTP connection for #{topic} established #{writer}"
+          link @writer
+        end
+      end
+
+      # Establish required connections (producer/consumer)
+      def connect
+        unless(callbacks.empty?)
+          unless(lookupd.empty?)
+            build_consumer
+            info "Consumer connection for #{topic}:#{channel} established #{reader}"
+          end
         end
+        build_producer
       end
 
       # @return [Krakow::Consumer]

data/lib/carnivore-nsq/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-nsq
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Chris Roberts