zuora_api 1.6.18 → 1.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde9d48ecb8183a809d7e461374871cb29ac822f
-  data.tar.gz: 4f0493a78076b964141587055532e003757a013b
+  metadata.gz: d1fc5fd80b603068e7275109a79cf583be06a555
+  data.tar.gz: 14e5d8ba42672c04efa2bd1b6d66f7e7adb703d2
 SHA512:
-  metadata.gz: f383c511e9ea580b74589341f9d69ad4e6303b55a888ca63cc75566024ebc55eba6cd87df782f1bb99b079d9caf76e7edb424a3564e416135a34e2d20e986953
-  data.tar.gz: 4f998b30cf6cb7265676ed00bcf69782a5eb5222a2162a29a1ef335d671dbaa73a0f17217b7d975854888f5955d137f239acd8e6cf41d08c729c8dd396d50a8c
+  metadata.gz: bf8783fdd21fb1d7374bd44b96841f1f36e43b42537b15a17aef6e67b7b2ddad6808acfb5bcbee0a30ff8775cbdf67b9b3b60abce14c3be830357c4fc092e503
+  data.tar.gz: e7f594df58d83af49f7a308d66fd09632bcd45f058142da7e5a167aa2ca969591dfa903aa40e45159c57c1f67d03d94a4056a543bd312544304933d18642998a

data/lib/zuora_api/login.rb

@@ -8,6 +8,9 @@ module ZuoraAPI
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
     MIN_Endpoint = '91.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION 
+    CONNECTION_EXCEPTIONS = [Net::OpenTimeout, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError]
+    CONNECTION_READ_EXCEPTIONS = [Net::ReadTimeout, Errno::ECONNRESET, Errno::EPIPE]
+
     attr_accessor :region, :url, :wsdl_number, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
 
     def initialize(url: nil, entity_id: nil, session: nil, status: nil, **keyword_args)
@@ -437,7 +440,15 @@ module ZuoraAPI
       else
         return output_xml, input_xml, response
       end
-    rescue Net::OpenTimeout, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
+    rescue *CONNECTION_EXCEPTIONS => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
+      end
+    rescue *CONNECTION_READ_EXCEPTIONS => ex
       if !(tries -= 1).zero? && timeout_retry
         Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
@@ -686,7 +697,7 @@ module ZuoraAPI
         end
         des_hash[:related_objects] = output_xml.xpath(".//related-objects").xpath(".//object").map{ |x| [x.xpath(".//name").text.to_sym, [ [:url, x.attributes["href"].value], [:label, x.xpath(".//name").text ] ].to_h] }.to_h
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
+    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
@@ -758,7 +769,15 @@ module ZuoraAPI
       end
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
-    rescue Net::OpenTimeout, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError => ex
+    rescue *CONNECTION_EXCEPTIONS => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
+      end
+    rescue *CONNECTION_READ_EXCEPTIONS => ex
       if !(tries -= 1).zero? && timeout_retry
         Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)
@@ -858,7 +877,7 @@ module ZuoraAPI
             self.new_session if z_session
             return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout)
 
-          when Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError
+          when *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS)
             Rails.logger.fatal("#{response.class} timeout - retry")
             return get_file(:url => url, :headers => headers, :count => count, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries - 1, :timeout => timeout)
 
@@ -931,7 +950,7 @@ module ZuoraAPI
                 size += chunk.size
                 new_progress = (size * 100) / export_size
                 unless new_progress == export_progress
-                  Rails.logger.debug("Login: #{self.username} Export Downloading %s (%3d%%)" % [filename, new_progress])
+                  Rails.logger.debug("Login: Export Downloading %s (%3d%%)" % [filename, new_progress])
                 end
                 export_progress = new_progress
               end

data/lib/zuora_api/logins/basic.rb

@@ -88,7 +88,7 @@ module ZuoraAPI
         self.current_session = retrieved_session
       end
       return self.status
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex 
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)

data/lib/zuora_api/logins/oauth.rb

@@ -52,7 +52,7 @@ module ZuoraAPI
       else
         return [output_json, response]
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
@@ -92,7 +92,7 @@ module ZuoraAPI
       else
         return [output_json, response]
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.18"
+  VERSION = "1.6.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.18
+  version: 1.6.19
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-26 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler