zuora_connect 1.7.07 → 1.7.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62d960a3791bd3d689c4001b3543aeacc6a94733
-  data.tar.gz: 415d8a54f6f29e570e3ec2a391bb7800ef9aa1c0
+  metadata.gz: c5f73ba41b420d1b552236557a910cadb74a0f29
+  data.tar.gz: a32115c1a42f2774bbb030eeacc5480f0afcc0f4
 SHA512:
-  metadata.gz: 835cfce87967db8a0faac7eb9d1aa519774432232829f0b02678515c6cfe076cec4a653f342a974d60914da88172cada6c714128ebc94f8f0a9a1d52b3bac439
-  data.tar.gz: 951bb6ba48a6bf83674d0a3842230f85fa8ba7c07ccecf12d291d123ce3852a6f0b853af5eef14f6555d9b2a3ca33b82f04d017a52cba042189cf0d0afbc25df
+  metadata.gz: e65354cd51cfa0a818a9979a45b217d2535131b1739e15753882db63340f106ec582dc023e865221985746f99b16c725f203b1cdeb08942f6b3ae580d2a5e957
+  data.tar.gz: d7c556be08e52be64a65f3f9a9ceb9dd95c7a60790076b6de46dfedfe28132efce0d2b45d239c4b4d62da1a9212fd4615b9b095990e966429d37206c00f2a344

data/app/models/zuora_connect/app_instance_base.rb

@@ -4,7 +4,7 @@ module ZuoraConnect
     default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_mapping", "catalog"].include?(x) }) }
     after_initialize :init
     self.table_name = "zuora_connect_app_instances"
-    attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message
+    attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message, :new_session_message, :connect_user
     @@telegraf_host = nil
     REFRESH_TIMEOUT = 2.minute                #Used to determine how long to wait on current refresh call before executing another
     INSTANCE_REFRESH_WINDOW = 1.hours         #Used to set how how long till app starts attempting to refresh cached task connect data
@@ -13,9 +13,10 @@ module ZuoraConnect
     BLANK_OBJECT_ID_LOOKUP = 'BlankValueSupplied'
 
     def init
-      @options = Hash.new
-      @logins = Hash.new
-      @api_version = "v2"
+      self.connect_user = 'Nobody'
+      self.options = Hash.new
+      self.logins = Hash.new
+      self.api_version = "v2"
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       PaperTrail.whodunnit = "Backend" if defined?(PaperTrail)
@@ -38,11 +39,13 @@ 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, log_level: Logger::INFO)
-      @api_version = "v2"
-      @username = username
-      @password = password
-      @last_refresh = session["#{self.id}::last_refresh"]
+    def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token, holding_pattern: false, log_level: Logger::DEBUG)
+      self.api_version = "v2"
+      self.username = username
+      self.password = password
+      self.last_refresh = session["#{self.id}::last_refresh"]
+      self.connect_user = session["#{self.id}::user::email"]
+      PaperTrail.whodunnit = self.connect_user if defined?(PaperTrail)
 
       ## DEV MODE TASK DATA MOCKUP
       if ZuoraConnect.configuration.mode != "Production"
@@ -52,7 +55,7 @@ module ZuoraConnect
 
         case ZuoraConnect.configuration.dev_mode_options.class
         when Hash
-          @options = ZuoraConnect.configuration.dev_mode_options
+          self.options = ZuoraConnect.configuration.dev_mode_options
         when Array
           mock_task_data["options"] = ZuoraConnect.configuration.dev_mode_options
         end
@@ -67,34 +70,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.add(log_level, "[#{self.id}] REFRESHING - Session Empty")
+          self.new_session_message = "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.add(log_level,"[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})")
+          self.new_session_message = "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.add(log_level,"[#{self.id}] REFRESHING - Task Data Blank")
+          self.new_session_message = "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.add(log_level,"[#{self.id}] REFRESHING - No Time on Cookie")
+          self.new_session_message = "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.add(log_level,"[#{self.id}] REFRESHING - Session Old by #{time_expire.abs} second")
+          self.new_session_message = "REFRESHING - Session Old by #{time_expire.abs} second"
           self.refresh(session)
         else
           if time_expire < 0
-            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(','))
+            self.new_session_message = ["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.add(log_level,"[#{self.id}] REBUILDING - Expires in #{time_expire} seconds")
+            self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
@@ -108,12 +111,15 @@ module ZuoraConnect
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
-        Rails.logger.add(log_level, "[#{self.id}] Holding - Expires in #{self.reset_mark_expires_at}")
+        Rails.logger.add(log_level, "Holding - Expires in #{self.reset_mark_expires_at}")
         sleep(5)
       end
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
       session = self.data_lookup(session: session)
       retry
+
+    ensure
+      Rails.logger.add(log_level, self.new_session_message)
     end
 
     def refresh(session = nil)
@@ -358,9 +364,6 @@ module ZuoraConnect
       end
 
       def data_lookup(session: {})
-        if defined?(PaperTrail)
-          PaperTrail.whodunnit = session["#{self.id}::user::email"].present? ? session["#{self.id}::user::email"] : nil if session.present?
-        end
         if defined?(Redis.current)
           cached_instance = Redis.current.get("AppInstance:#{self.id}")
           if cached_instance.blank?
@@ -368,7 +371,7 @@ module ZuoraConnect
             return session
           else
             Rails.logger.debug("[#{self.id}] Cached AppInstance Found")
-            return decrypt_data(data: cached_instance, rescue_return: session)
+            return decrypt_data(data: cached_instance, rescue_return: session).merge(session)
           end
         else
           return session

data/lib/zuora_connect/railtie.rb

@@ -33,17 +33,25 @@ module ZuoraConnect
         require 'lograge'
         logger           = ActiveSupport::Logger.new(STDOUT)
         logger.formatter = ::Logger::Formatter.new
+        # logger.formatter  = proc do |severity, datetime, progname, msg|
+        #   {severity: severity, time: datetime.strftime('%FT%T.%6N'), process_id: Process.pid, message: msg }.to_json
+        # end
         Rails.configuration.logger = ActiveSupport::TaggedLogging.new(logger)
+        Rails.configuration.log_tags = [:uuid]
         Rails.configuration.lograge.enabled = true
         Rails.configuration.lograge.formatter = Lograge::Formatters::Json.new
         Rails.configuration.lograge.custom_options = lambda do |event|
           exceptions = %w(controller action format id)
-          {
-            appinstance_id: Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : 0,
+          items = {
+            #time: event.time.strftime('%FT%T.%6N'),  
             params: event.payload[:params].except(*exceptions),
             exception: event.payload[:exception],
-            exception_object: event.payload[:exception_object]
+            exception_object: event.payload[:exception_object],
+            process_id: Process.pid
           }
+          if Thread.current[:appinstance].present? 
+            items.merge({appinstance_id: Thread.current[:appinstance].id, connect_user: Thread.current[:appinstance].connect_user, new_session: Thread.current[:appinstance].new_session_message})
+          end
         end
       end
     end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.07"
+  VERSION = "1.7.08"
 end

metadata

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