protobuf-nats 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55bbcf7a29b27d1d9cfd00b88579581f8ab581b
-  data.tar.gz: fa5b7bafb1e967ee34cb79b3afef6119accb5efb
+  metadata.gz: f814c4c1e02c6a9b768e1ab2e0ed963af5098215
+  data.tar.gz: a2a120ca37a85cfe6bab4d505e0f4d48ddfba77b
 SHA512:
-  metadata.gz: d0f35efe85018a2f3eede00b73b4c5c84e9d499a12f3e487655031a05522040ab029e599a0fe45d5cc311ceccdca501c21554d5c868cded997bfe7aed96f4e39
-  data.tar.gz: c1bc44baeff5152bb07ec1abc4dbfa73209a02d7648f98178c453320fa5d67579537b29e887df6652eca40a026b4058bdf9adc6f87181c9cfc6035c6a2aefe13
+  metadata.gz: c307b1b2e4cf076047b612c0bdbec5baadecdc28c2dab623bf8932243a039702b105e137b7ba95e74b0934121f4b8f2d41a0a9c64306f7647eafe0c372031d19
+  data.tar.gz: ed0fc48cb9c2928eb7221602013bde0c3c9eb1297efa139450f5b1baebce5773e16ade799feefb00a6cc09518ade8c7973544c778f6ab33dbfcf985764ea95cd

data/lib/protobuf/nats/client.rb

@@ -21,25 +21,6 @@ module Protobuf
         @subscription_key_cache ||= {}
       end
 
-      # This is an alternative to depending on #failure for invoking the error callback.
-      # We never want to silence an error in the event that no callback is provided.
-      def failure_handler
-        yield
-      rescue => error
-        logger.debug { sign_message("Server failed request (invoking on_failure): #{error.inspect}") }
-
-        begin
-          if @failure_cb
-            @failure_cb.call(error)
-          else
-            raise
-          end
-        ensure
-          # Complete stats and log
-          complete
-        end
-      end
-
       def ack_timeout
         @ack_timeout ||= if ::ENV.key?("PB_NATS_CLIENT_ACK_TIMEOUT")
           ::ENV["PB_NATS_CLIENT_ACK_TIMEOUT"].to_i
@@ -65,29 +46,28 @@ module Protobuf
       end
 
       def send_request
-        failure_handler do
-          begin
-            retries ||= 3
-
-            setup_connection
-            request_options = {:timeout => response_timeout, :ack_timeout => ack_timeout}
-            @response_data = nats_request_with_two_responses(cached_subscription_key, @request_data, request_options)
-            parse_response
-          rescue ::Protobuf::Nats::Errors::IOException => error
-            ::Protobuf::Nats.log_error(error)
-
-            delay = reconnect_delay
-            logger.warn "An IOException was raised. We are going to sleep for #{delay} seconds."
-            sleep delay
-
-            retry if (retries -= 1) > 0
-            raise
-          rescue ::NATS::IO::Timeout
-            # Nats response timeout.
-            retry if (retries -= 1) > 0
-            raise
-          end
-        end
+        retries ||= 3
+
+        setup_connection
+        request_options = {:timeout => response_timeout, :ack_timeout => ack_timeout}
+        @response_data = nats_request_with_two_responses(cached_subscription_key, @request_data, request_options)
+        parse_response
+      rescue ::Protobuf::Nats::Errors::IOException => error
+        ::Protobuf::Nats.log_error(error)
+
+        delay = reconnect_delay
+        logger.warn "An IOException was raised. We are going to sleep for #{delay} seconds."
+        sleep delay
+
+        retry if (retries -= 1) > 0
+        raise
+      rescue ::NATS::IO::Timeout
+        # Nats response timeout.
+        retry if (retries -= 1) > 0
+        raise
+      ensure
+        # Complete stats and log
+        complete
       end
 
       def cached_subscription_key

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf