zuora_api 1.7.65b → 1.7.65c

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2cbbb29a43233ab20aa0c0c03ad09170070fa3d46b4fda9ef03cb4ff6d88c3a
-  data.tar.gz: c4b2c7f25f30ec251b1a2c310b87bb4c60e42a8f6d67362b208420b391fb8bf3
+  metadata.gz: 6707b17c4dcf42bc9b1125e2d0cf4060cc92a32f73ada2407d68ac23c3b13c90
+  data.tar.gz: 59f9d07a0741f61581d85b5b0354f050f81832276cca1a1f8a6a6f974020fde6
 SHA512:
-  metadata.gz: c3a02b7dd3ee4f89503d7058595bda561d3a1753ee76ba6d697d8bbd3d9a56268fd99b6e10f198c30efd74a6592f85bf5d6d2182cc0f9477320fe67e2dcf94f2
-  data.tar.gz: c269803e8561fc7d787dbe34198331e3a99a2724e945520b68376119af4d69f1da9ada4e4cb725a50f897a4ba479b1b56785adff658b327e716cb89c58c12165
+  metadata.gz: aa61a11e859e7a00b82903f2c792a3b9bbe486a24c8774cbe0b049db7ffbf9afe800060c0c41aa782918d3e373f57c45eb0e50143bc7a487c29d5bc09db02458
+  data.tar.gz: b6bf8efa26d37b295a1ed4db27809833e3821d03fb62d2cc186c11846b504d6b85591800cd105494820b53ef4a76cd36f1e0187f6c94780c836787dd43190c9e

data/lib/zuora_api/login.rb

@@ -534,6 +534,7 @@ module ZuoraAPI
             Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}") if ex.is_a?(Net::ReadTimeout)
         raise ex
       end
 
@@ -552,6 +553,7 @@ module ZuoraAPI
             Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}") if ex.is_a?(Net::ReadTimeout)
         raise ex
       end
     rescue => ex
@@ -602,7 +604,7 @@ module ZuoraAPI
             reason = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
             if reason.present?
               message = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
-              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
+              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response|Socket Timeout)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
             else
               error = 'FATAL_ERROR'
               message = 'Export failed due to unknown reason. Consult api logs.'
@@ -1114,7 +1116,8 @@ module ZuoraAPI
             Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
-        raise ex 
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}") if ex.is_a?(Net::ReadTimeout)
+        raise ex
       end
 
       tries -= 1
@@ -1132,6 +1135,7 @@ module ZuoraAPI
             Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}") if ex.is_a?(Net::ReadTimeout)
         raise ex
       end
     rescue => ex
@@ -1189,6 +1193,8 @@ module ZuoraAPI
     def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 120, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
+      retry_count ||= timeout_retries
+
       #Make sure directory exists
       require 'fileutils'
       FileUtils.mkdir_p(file_path) unless File.exists?(file_path)
@@ -1206,7 +1212,6 @@ module ZuoraAPI
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
       response_save = nil
-      retry_count ||= timeout_retries
       http.request_get(uri.request_uri, headers) do |response|
         response_save = response
         status_code = response.code if response

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.65b"
+  VERSION = "1.7.65c"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.65b
+  version: 1.7.65c
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler