zuora_api 1.7.60 → 1.7.61a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ecb83259da9f58c2dbad9a679cbb411f37d8ef23ebea2cffd9405b68f959e9
-  data.tar.gz: fa497edac6fa08fb7ca2a1303d41cc495f0be03d1fef006a837c75d3f64fdd93
+  metadata.gz: 61febe9fbe7f75491e385756ea35ddb507ae2ac97f63545b2c7e8a989daf97ec
+  data.tar.gz: 1ecbdd5b89eddd1d6e3e4fe8fe3696577f85fb0ccb173519035ec68e7b3ce3e5
 SHA512:
-  metadata.gz: 3f3001fbf45414d069597957dd0d4cee7bf89d32cf66113b2bb241cf449cd6e00c99d8e7a5766cb95152c6a36477f6beddad5548b37b6327ccdf3474d8bbe22c
-  data.tar.gz: 55ebf58e10e4e813a64e47988d8b6e75dd7bb76f5fc26cf63800c83449585e4c154b4509f9ddcac97915e7f43b570f35cd92303fbe80516a4b0ca7905b2676fd
+  metadata.gz: 2c93d65aabc407f4116f83c3eda1fa61a2fbb6a903b7a81889092645863596b8e932ea1829c9a28c73838cbca93036682ca3a6be69194929ba7cdf30bfcf1f9a
+  data.tar.gz: 698f044f7484dbcd831ea3a05ed3e867f6b72b22269354571565ab0b995a56c11479bac45cd5640295a251e91c50e1406b7148cecf9ebfe205789054e2c5b44b

data/lib/zuora_api/login.rb

@@ -435,6 +435,7 @@ module ZuoraAPI
       z_session: true, 
       timeout_retry: false, 
       timeout: 120,
+      timeout_sleep_interval: self.timeout_sleep, 
       output_exception_messages: true,
       **keyword_args)
       tries ||= 2
@@ -512,24 +513,24 @@ module ZuoraAPI
       if tries.zero?
         if output_exception_messages
           if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("SOAP Call - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+            Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
           else
-            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
         raise ex 
       end
 
       tries -= 1
-      sleep(self.timeout_sleep)
+      sleep(timeout_sleep_interval)
       retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
       if tries.zero?
         if output_exception_messages
           if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("SOAP Call - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+            Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
           else
-            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
         raise ex
@@ -540,14 +541,14 @@ module ZuoraAPI
       if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
         retry
       elsif timeout_retry
-        sleep(self.timeout_sleep)
+        sleep(timeout_sleep_interval)
         retry
       else
         if output_exception_messages
           if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("SOAP Call - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+            Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
           else
-            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
         raise ex
@@ -994,6 +995,7 @@ module ZuoraAPI
       session_type: :basic,
       timeout_retry: false,
       timeout: 120,
+      timeout_sleep_interval: self.timeout_sleep, 
       multipart: false,
       stream_body: false,
       output_exception_messages: true,
@@ -1022,20 +1024,20 @@ module ZuoraAPI
           multipart: multipart,
           stream_body: stream_body
         ).perform(&block)
-
-        Rails.logger.debug("Response Code: #{response.code}") if debug
-        begin
-          output_json = JSON.parse(response.body)
-        rescue JSON::ParserError => ex
-          output_json = {}
-        end
-        Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
-
-        raise_errors(type: :JSON, body: output_json, response: response)
       rescue
         reset_files(body) if multipart
         raise
       end
+
+      Rails.logger.debug("Response Code: #{response.code}") if debug
+      begin
+        output_json = JSON.parse(response.body)
+      rescue JSON::ParserError => ex
+        output_json = {}
+      end
+      Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
+
+      raise_errors(type: :JSON, body: output_json, response: response)
     rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
       if self.class.to_s == 'ZuoraAPI::Oauth' && ex.message.include?("Authentication type is not supported by this Login")
         session_type = :bearer
@@ -1076,24 +1078,24 @@ module ZuoraAPI
       if tries.zero?
         if output_exception_messages
           if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("Rest Call - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+            Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
           else
-            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
         raise ex 
       end
 
       tries -= 1
-      sleep(self.timeout_sleep)
+      sleep(timeout_sleep_interval)
       retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
       if tries.zero?
         if output_exception_messages
           if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("Rest Call - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+            Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
           else
-            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
         raise ex 
@@ -1104,14 +1106,14 @@ module ZuoraAPI
       if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
         retry
       elsif timeout_retry
-        sleep(self.timeout_sleep)
+        sleep(timeout_sleep_interval)
         retry
       else
         if output_exception_messages
           if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("Rest Call - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+            Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
           else
-            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
           end
         end
         raise ex

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.60"
+  VERSION = "1.7.61a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.60
+  version: 1.7.61a
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,9 +182,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: