zuora_connect 1.5.313 → 1.5.314

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7fa631da95562ffbed414ffc8b15c7ca7caf757
-  data.tar.gz: c7defc8fb255e7719fa74cc64d679a761be9ce29
+  metadata.gz: d0cf0420609a3c81b7024dd3903606536b411213
+  data.tar.gz: cd2ace3b4722dfd1dcd354555f097462014392f4
 SHA512:
-  metadata.gz: 57bba8bae751a23da6bb36a2f2e53837434a3450cebf1ec2900b5b1d0162fc6d4fff30206465718f1dd096fad1ed618cd1f20cd38996922a5c099d256fb79d48
-  data.tar.gz: 0790067b06387204f4921d044cc72899f80590c138607eed111cbcce74f9c463e1490c3aeaeecdb69fd2119cc868c9fba9b1d6d65d34dd4ec4a2791d6c89cfaf
+  metadata.gz: 7b9a0c804973326def2ea1c754866a26dfa579647a363e1cad92d5bc832eb989d74140df5e3ec0a5b9f0eabdef3ce0f4e4445e6ce0c206fe250def9c71bb3e16
+  data.tar.gz: 77e84f038f3a121ff7fb2e9a63883a1c2dd26eb838527eaf2df30fac0053773f1828a21670e1c4190a4f54cbe3d80ef7ea720a1d27bf94eec27ef25b47e72d64

data/app/models/zuora_connect/app_instance_base.rb

@@ -33,7 +33,7 @@ module ZuoraConnect
       Thread.current[:appinstance] = self
     end
 
-    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token)
+    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false)
       @api_version = "v2"
       @username = username
       @password = password
@@ -63,18 +63,22 @@ module ZuoraConnect
 
         if session.empty?
           Rails.logger.info("[#{self.id}] REFRESHING - Session Empty")
+          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
         elsif (self.id != session["appInstance"].to_i) 
           Rails.logger.info("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})")
+          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
         elsif session["#{self.id}::task_data"].blank?
           Rails.logger.info("[#{self.id}] REFRESHING - Task Data Blank")
+          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
         elsif session["#{self.id}::last_refresh"].blank?
           Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") 
+          raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
         # If the cache is expired and we can aquire a refresh lock  
@@ -83,7 +87,7 @@ module ZuoraConnect
           self.refresh(session)
         else
           if time_expire < 0
-            Rails.logger.info(["[#{self.id}] REBUILDING - Expired by #{time_expire} seconds", self.marked_for_refresh? ? " cache updating as of #{self.refreshed_at} seconds ago" : nil].compact.join(','))
+            Rails.logger.info(["[#{self.id}] REBUILDING - Expired by #{time_expire} seconds", self.marked_for_refresh? ? " cache updating as of #{self.reset_mark_refreshed_at} seconds ago" : nil].compact.join(','))
           else
             Rails.logger.info("[#{self.id}] REBUILDING - Expires in #{time_expire} seconds")
           end
@@ -98,6 +102,13 @@ module ZuoraConnect
       Time.zone = self.timezone
       Thread.current[:appinstance] = self
       return self
+    rescue ZuoraConnect::Exceptions::HoldingPattern => ex
+      while self.marked_for_refresh?
+        Rails.logger.info("[#{self.id}] Holding - Expires in #{self.reset_mark_expires_at}")
+        sleep(5)
+      end
+      self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
+      retry
     end
 
     def refresh(session = nil)
@@ -110,25 +121,30 @@ module ZuoraConnect
       Rails.logger.info("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
       if response.code == 200
         build_task(JSON.parse(response.body), session)
-
         @last_refresh = Time.now.to_i
         self.cache_app_instance
+        self.reset_mark_for_refresh
       else
+        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
       if (refresh_count += 1) < 3
+        Rails.logger.info("[#{self.id}] REFRESH TASK - Timeout Retrying(#{refresh_count})")
         retry
       else
+        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Timeout Failed #{refresh_count}x")
         raise
       end
     rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
       if (refresh_count += 1) < 3
+        Rails.logger.info("[#{self.id}] REFRESH TASK - Failed Retrying(#{refresh_count})")
         if ex.code == 401
           self.refresh_oauth
         end
         retry
       else
+        Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
         raise
       end
     end
@@ -236,15 +252,21 @@ module ZuoraConnect
         end
       rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
         if (refresh_oauth_count += 1) < 3
+          Rails.logger.info("[#{self.id}] REFRESH OAUTH - Timeout Retrying(#{refresh_oauth_count})")
           retry
         else
+          Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Timeout Failed #{refresh_oauth_count}x")
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
+        sleep(5)
+        self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token]) #Reload only the refresh token for retry
+          
+        #After reload, if nolonger expired return
+        return if !self.oauth_expired?
+
         if (refresh_oauth_count += 1) < 3
           Rails.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
-          sleep(5)
-          self.reload_attributes([:refresh_token]) #Refload only the refresh token for retry
           retry
         else
           Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{refresh_oauth_count}x")
@@ -262,10 +284,14 @@ module ZuoraConnect
         Redis.current.del("AppInstance:#{self.id}:Refreshing") if defined?(Redis.current)
       end
 
-      def refreshed_at
+      def reset_mark_refreshed_at
         return defined?(Redis.current) ? REFRESH_TIMEOUT.to_i - Redis.current.ttl("AppInstance:#{self.id}:Refreshing") : 0
       end
 
+      def reset_mark_expires_at
+        return defined?(Redis.current) ? Redis.current.ttl("AppInstance:#{self.id}:Refreshing") : 0
+      end
+
       def mark_for_refresh
         return defined?(Redis.current) ? Redis.current.set("AppInstance:#{self.id}:Refreshing", true, {:nx => true, :ex => REFRESH_TIMEOUT.to_i}) : true
       end 
@@ -292,6 +318,7 @@ module ZuoraConnect
         if defined?(Redis.current)
           #Task data must be present and the last refresh cannot be old. We dont want to overwite new cache data with old
           if self.task_data.present? &&  (self.last_refresh.to_i > INSTANCE_REFRESH_WINDOW.ago.to_i)
+            Rails.logger.info("[#{self.id}] Caching AppInstance")
             Redis.current.setex("AppInstance:#{self.id}", INSTANCE_REDIS_CACHE_PERIOD.to_i, encrypt_data(data: self.save_data))
           end
           Redis.current.del("Deleted:#{self.id}")

data/lib/zuora_connect/exceptions.rb

@@ -1,5 +1,7 @@
 module ZuoraConnect
   module Exceptions
+
+    class HoldingPattern < StandardError; end
     class Error < StandardError; end
     class AuthorizationNotPerformed < Error; end
 

data/lib/zuora_connect/version.rb

@@ -1,4 +1,4 @@
 module ZuoraConnect
-  VERSION = "1.5.313"
+  VERSION = "1.5.314"
 end
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.313
+  version: 1.5.314
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment