insights-api-common 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8a770535b65f1da98fa3196078052c5048bd13dcd4253145aa04afa5d6c1bf9
-  data.tar.gz: 13f54d55fe5343eaec0116095014e3782232e836e8e1d610a1e1120ea59b68b8
+  metadata.gz: 43e76c5bf47d65b4040b8ed210158adaae8730ea0ceca8a5bd51816d6572e75c
+  data.tar.gz: eca7c58f7e1c6051ed91d31a77e37f7559113aaedc54d6640f5986efc23557cf
 SHA512:
-  metadata.gz: d329437271a364dc4d03b31b484400c2ab496b91a17f2e39c80fd57c249a992b7e6764b69724677120fe1de219c315472835809df5001a348fd264bb66a8961c
-  data.tar.gz: 93510825434809fde1d60e46b73a8f80f61535d41d77f8ebe2df716e26212d1903a0f9d9911f328bf4e6607c6aaa5a64aea46617ad39a763819f6325cab851d7
+  metadata.gz: '081dae0fe687ba670fc6f6f1ca3a15ce399c99b7c55bc6297cce261a818189bbb6674d44e96c93296394780c25169cd214680c42dc941b0ab83c6dcfe37df246'
+  data.tar.gz: d2f112e2339e2398c761e08f447e2aed84ba4a7b15c2ec7fc9371d9aea6602afdb4c9f6ec96ead262e2879ee6f849ab572a20aa1582180f13265899ab98bb245

data/lib/insights/api/common/logging.rb

@@ -2,14 +2,27 @@ module Insights
   module API
     module Common
       class Logging
-        def self.activate(config)
-          require 'manageiq/loggers'
-          config.logger = if Rails.env.production?
-                            config.colorize_logging = false
-                            ManageIQ::Loggers::CloudWatch.new
-                          else
-                            ManageIQ::Loggers::Base.new(Rails.root.join("log", "#{Rails.env}.log"))
-                          end
+        def self.logger_class
+          if ENV['LOG_HANDLER'] == "haberdasher"
+            "Insights::Loggers::StdErrorLogger"
+          else
+            "Insights::Loggers::CloudWatch"
+          end
+        end
+
+        def self.activate(config, app_name = nil)
+          require 'insights/loggers'
+          log_params = {}
+          klass_for_logger = if Rails.env.production?
+                               config.colorize_logging = false
+                               log_params[:app_name] = app_name if app_name
+                               logger_class
+                             else
+                               log_params = {:log_path => Rails.root.join("log", "#{Rails.env}.log")}
+                               "ManageIQ::Loggers::Base"
+                             end
+
+          config.logger = Insights::Loggers::Factory.create_logger(klass_for_logger, log_params)
         end
       end
     end

data/lib/insights/api/common/version.rb

@@ -1,7 +1,7 @@
 module Insights
   module API
     module Common
-      VERSION = "5.0.5".freeze
+      VERSION = "5.0.6".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-api-common
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
 platform: ruby
 authors:
 - Insights Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -73,33 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.2.1
 - !ruby/object:Gem::Dependency
-  name: manageiq-loggers
+  name: insights-loggers-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: cloudwatchlogger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
   requirement: !ruby/object:Gem::Requirement