zuora_connect 1.7.04 → 1.7.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6c65bd36e9061203dd9ea2e55d230ce14bd5b8
-  data.tar.gz: 2b5facf174f25a137ab607526bbe5701d1d72706
+  metadata.gz: a857c08845f7874d0e5993d6dcfd64b5f477a6b7
+  data.tar.gz: 9b44889f84667d06f12eac95a99b89ee32de995c
 SHA512:
-  metadata.gz: e07a270696b0acd4df0bd925f948c3a166eb7aae36dc328f64847472a364030643d2e2674e36e30016f268ffd5496f56e0b1c9ca517db4fe362c2d16f0f8eb58
-  data.tar.gz: e3049b0cb2552c5768e9e114f0544d13b3bfd2d73e3bf5d938ae264f7556eb18118acb397f5a98e31995ae72461629185e38fb2c8e1a1379fa77385bd6e5e9a5
+  metadata.gz: 2d448ca83a052c5b045efb072642c7fa69290ced6ed63b83b4bce9d07821637f11eb1fea44cc9a2dc68093a9c5fd66e799ae09d2f92e14e5c7b2e189c16fd096
+  data.tar.gz: 45a84690808ea9b2fad8506f7a07360f05adde3dfc4f649b7070e4bfd941bc7b012b587291b7a55a4907c3cc8fc824b279b69041cfefc0126e0a11fe7e95e4e3

data/app/models/zuora_connect/app_instance_base.rb

@@ -7,8 +7,8 @@ module ZuoraConnect
     attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message
     @@telegraf_host = nil
     REFRESH_TIMEOUT = 2.minute                #Used to determine how long to wait on current refresh call before executing another
-    INSTANCE_REFRESH_WINDOW = 30.minutes      #Used to set how how long till app starts attempting to refresh cached task connect data
-    INSTANCE_REDIS_CACHE_PERIOD = 60.minutes  #Used to determine how long to cached task data will live for
+    INSTANCE_REFRESH_WINDOW = 1.hours         #Used to set how how long till app starts attempting to refresh cached task connect data
+    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'
 
@@ -38,7 +38,7 @@ module ZuoraConnect
       Thread.current[:appinstance] = self
     end
 
-    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false)
+    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, log_level: Logger::INFO)
       @api_version = "v2"
       @username = username
       @password = password
@@ -67,34 +67,34 @@ module ZuoraConnect
         time_expire = (session["#{self.id}::last_refresh"] || Time.now).to_i - INSTANCE_REFRESH_WINDOW.ago.to_i
 
         if session.empty?
-          Rails.logger.info("[#{self.id}] REFRESHING - Session Empty")
+          Rails.logger.add(log_level, "[#{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})")
+          Rails.logger.add(log_level,"[#{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")
+          Rails.logger.add(log_level,"[#{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")
+          Rails.logger.add(log_level,"[#{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
         elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
-          Rails.logger.info("[#{self.id}] REFRESHING - Session Old by #{time_expire.abs} second")
+          Rails.logger.add(log_level,"[#{self.id}] REFRESHING - Session Old by #{time_expire.abs} second")
           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.reset_mark_refreshed_at} seconds ago" : nil].compact.join(','))
+            Rails.logger.add(log_level,["[#{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")
+            Rails.logger.add(log_level,"[#{self.id}] REBUILDING - Expires in #{time_expire} seconds")
           end
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
@@ -108,7 +108,7 @@ module ZuoraConnect
       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}")
+        Rails.logger.add(log_level, "[#{self.id}] Holding - Expires in #{self.reset_mark_expires_at}")
         sleep(5)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])

data/lib/middleware/metrics_middleware.rb

@@ -12,6 +12,7 @@ module Middleware
       # Getting the endpoint and the content_type
       content_hash = {:html => "text/html", :js => "application/javascript", :json => "application/json"}
       content_type = content_hash.key?(payload[:format]) ? content_hash[payload[:format]] : payload[:format]
+      content_type = content_type.gsub('text/javascript', 'application/javascript')
 
       # payloads with 500 requests do not have status as it is not set by the controller
       # https://github.com/rails/rails/issues/33335
@@ -89,7 +90,7 @@ module Middleware
         # Writing to telegraf: Handle 404
         if [404].include?(@status)
           content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
-
+          content_type = content_type.gsub('text/javascript', 'application/javascript')
           tags = {status: @status, content_type: content_type}
        
           tags = tags.merge({controller: 'ActionController', action: 'RoutingError' })

data/lib/zuora_connect/controllers/helpers.rb

@@ -50,7 +50,7 @@ module ZuoraConnect
           Rails.logger.error("Invalid Locale: #{ex.message}")
         end
         Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-        Rails.logger.info("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
+        Rails.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
       end
 
       def persist_connect_app_session

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.04"
+  VERSION = "1.7.05"
 end

metadata

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