carnivore-nsq 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51426c18010c2c755db91d0ecc57de7c619252bc
-  data.tar.gz: ba0b5f24e32a1bc41b43f1ee8cadb3f4fa2b8d1c
+  metadata.gz: e399157a914d9409adf05677cc934b54f4d3a9b6
+  data.tar.gz: 31c2b2bcbfd04ca660829e41aba0519e67956d21
 SHA512:
-  metadata.gz: 3e344591ee2ea0c053a1a6ece3bf8880dde978a7a329ea215b08a97a89842d0c1cd9249af2c0cf111dbf60eb90819d009cbeab5a02e682295dec2b1df02dbc54
-  data.tar.gz: 43718d3d9f797d829f1e9b8ea19ed95bfa5f86f4a0aaf09822308dab448578176403d3800022d343a775be9c87269b96b02cc5c72ff08d4faf974f979076e4ad
+  metadata.gz: 657c05e4620f97360586a772857db9dd5b6c6298cce8b73d39b83346d3c2af5f7a62f6d9b8932e96159945ffc9cd95255a8da672458dbedf80d6fa914c42cc43
+  data.tar.gz: 86a14b6e8b833323dbc026342f70767a2333f9e20a333f092111da2ef9b75c7305c1cbfd510ef4b39cd8f33ebcc44ee59d629ab2312d7d7f84af4f4190dc84b2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.10
+* Clean up exit trapping implementation
+* Suppress exception errors on touch/lookup
+
 ## v0.1.8
 * Do not rebuild consumer on general teardown
 * Log if message confirmation is not successful

data/lib/carnivore-nsq/nsq.rb

@@ -5,7 +5,7 @@ module Carnivore
   class Source
     class Nsq < Source
 
-      trap_exit :consumer_failure
+      trap_exit :trapper
 
       # @return [String] default path for global lookupd configuration
       DEFAULT_LOOKUPD_PATH = '/etc/carnivore/nsq.json'
@@ -31,19 +31,38 @@ module Carnivore
         Krakow::Utils::Logging.level = (Carnivore::Config.get(:krakow, :logging, :level) || :info).to_sym
       end
 
-      # Process linked failure
+      # Recover from exit if unexpected or tear down conenctions if requested
       #
       # @param obj [Celluloid::Actor] failed actor
       # @param exception [Exception] actor exception
-      def consumer_failure(obj, exception)
+      def trapper(obj, exception)
         if(exception)
           exclusive do
             warn 'Consumer failure detected. Forcing termination and rebuilding.'
-            @reader.terminate
+            begin
+              @reader.terminate
+            rescue => e
+              warn "Consumer error suppressed on termination: #{e.class} - #{e}"
+            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}"
+            end
+          end
         end
       end
 
@@ -127,9 +146,13 @@ module Carnivore
         begin
           unless(consumer.confirm(message[:message]))
             error "Failed to confirm payload from source! (#{e})"
+            false
+          else
+            true
           end
         rescue Krakow::Error::LookupFailed => e
           error "Failed to confirm payload from source! (#{e})"
+          false
         end
       end
 
@@ -138,7 +161,13 @@ module Carnivore
       # @param message [Carnivore::Message]
       # @return [TrueClass]
       def touch(message)
-        message[:message].touch
+        begin
+          message[:message].touch
+          true
+        rescue Krakow::Error::LookupFailed => e
+          error "Failed to touch payload from source! (#{e})"
+          false
+        end
       end
 
       private

data/lib/carnivore-nsq/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-nsq
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore