zuora_connect 1.7.44 → 1.7.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccccf542a4592e25ef4c2e1eb29bec32825aaf8a
-  data.tar.gz: 1249b913e677faa0cdd25992553fdd6c8bd39098
+  metadata.gz: 220690aeadd38cef3be8b43208affa8834c7db1e
+  data.tar.gz: 4c475d5be8d63d5d98132656e874004816cfa877
 SHA512:
-  metadata.gz: a428df87ed15ecbf85737df64bc2c2f0837182b78fadcd65bf2e7fd136582223fb54b0f1f049f86097032316297cae3b68219e6da746f2185a4a1465a7376bc1
-  data.tar.gz: 09e4198114efbd96daf3b4d21a1eec5623172a2a4186af8bea4948d8519145c1de552437c7ff6dca09c6a4972ed4c7c1135f1106e09c72be751061eb8f923bbb
+  metadata.gz: 8c1eea6bffd8b23012dfcd4c215b37d871d0d3c3fc2d82b5626aae5f8a5016b23acf0e2fa76c8cd47030a9d709bd865650db0558e2fd1d688ba349dd95bf0fcd
+  data.tar.gz: b35d70279fe75181a5c6e155d7dc75bb5bb6ca5edba53ae009558ced45d63db25656dbcc53dc87e5bd3ea0540a14cdf5d86a8206bd3252ec375c18b06632313d

data/app/models/zuora_connect/app_instance_base.rb

@@ -11,6 +11,8 @@ module ZuoraConnect
     INSTANCE_REDIS_CACHE_PERIOD = 24.hours    #Used to determine how long to cached task data will live for
     API_LIMIT_TIMEOUT = 2.minutes             #Used to set the default for expiring timeout when api rate limiting is in effect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
+    HOLDING_PATTERN_SLEEP = 5.seconds
+    CONNECT_COMMUNICATION_SLEEP= 5.seconds
 
     def init
       self.connect_user = 'Nobody'
@@ -122,7 +124,7 @@ module ZuoraConnect
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
         Rails.logger.info("Holding - Expires in #{self.reset_mark_expires_at}. '#{self.new_session_message}'")
-        sleep(5)
+        sleep(HOLDING_PATTERN_SLEEP)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
       session = self.data_lookup(session: session)
@@ -161,7 +163,7 @@ module ZuoraConnect
         Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed Code #{response.code}")
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
       end
-    rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+    rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
       if (refresh_count += 1) < 3
         Rails.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
@@ -285,7 +287,7 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (update_login_count += 1) < 3
           retry
         else
@@ -313,7 +315,7 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (update_task_count += 1) < 3
           retry
         else
@@ -367,7 +369,7 @@ module ZuoraConnect
           Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed Code #{response.code}")
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Refreshing Access Token", response.body, response.code)
         end
-      rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
         if (refresh_oauth_count += 1) < 3
           Rails.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
           retry
@@ -376,7 +378,7 @@ module ZuoraConnect
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-        sleep(5)
+        sleep(CONNECT_COMMUNICATION_SLEEP)
         self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token]) #Reload only the refresh token for retry
 
         #After reload, if nolonger expired return
@@ -415,7 +417,16 @@ module ZuoraConnect
 
       def data_lookup(session: {})
         if defined?(Redis.current)
-          cached_instance = Redis.current.get("AppInstance:#{self.id}")
+          begin
+            redis_get_command ||= 0
+            cached_instance = Redis.current.get("AppInstance:#{self.id}")
+          rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS).concat(ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+            if (redis_get_command += 1) < 3
+              retry
+            else
+              raise
+            end
+          end
           if cached_instance.blank?
             Rails.logger.debug("[#{self.id}] Cached AppInstance Missing")
             return session

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.44"
+  VERSION = "1.7.45"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.44
+  version: 1.7.45
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.21
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.21
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.21
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement