foreman_scc_manager 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb848728ea3961f30b44e6a02f43b84e73555ff703b0e0c3456e772e66132536
-  data.tar.gz: e7ca63acbe79ac2def4f203a0f10c269230652a35efd53e08d7fec4c536f2a18
+  metadata.gz: '090b5f9a98b9857d79b99c0206249dc632ad381f65e513da9a7fbcd5b4065e4d'
+  data.tar.gz: 6f099c604ebaedbda016c4b107acac1a8333516673d69976809a6329866c9f07
 SHA512:
-  metadata.gz: 215eaa829b2d7e544d818e421850763f4d78bc2b3e62d38d397980c10d0d066bea28e6a9d1fcacfdcb93486a683c0350fdaa0ea80451aebb99f6a7761cda62cc
-  data.tar.gz: a93f9a77bcc06abff4e22e78268363f5ae2a71be7d64debd8184ecfdeed412586f9e92bd8a5d7ef11d6308c7149950e7fd0114ef806c6d9717766cc838ed131c
+  metadata.gz: 2c4e5ed794d362e22128bb90efa721e9d5539fec4854e95da82f50076e5d2fb75220da7b9b6b6175343518ca25b30ed50b4a6f3d98944d30f767af2da31423c2
+  data.tar.gz: 061fc929ec7698229893e16bf1873c7e3006de9647d351c64f5f69404331730f8b394759db5d922314b51f0cbb2645401d153e4dac5666d9e242b3ee4f3311a0

data/app/lib/actions/scc_manager/sync_products.rb

@@ -20,7 +20,9 @@ module Actions
                                                input.fetch(:login),
                                                decrypt_field(input.fetch(:password)))
           output[:data] = ::SccManager.sanitize_products(products).values
-        rescue StandardError
+        rescue StandardError => e
+          ::Foreman::Logging.logger('foreman_scc_manager').error "Error while syncronizing SCC-Products: #{e}"
+          output[:error] = e.to_s
           output[:status] = 'FAILURE'
         end
       end

data/app/lib/actions/scc_manager/sync_repositories.rb

@@ -19,7 +19,9 @@ module Actions
                                                     input[:login],
                                                     decrypt_field(input[:password]))
           output[:status] = 'SUCCESS'
-        rescue StandardError
+        rescue StandardError => e
+          ::Foreman::Logging.logger('foreman_scc_manager').error "Error while syncronizing SCC-Repositories: #{e}"
+          output[:error] = e.to_s
           output[:status] = 'FAILURE'
         end
       end

data/app/lib/scc_manager.rb

@@ -8,8 +8,8 @@ module SccManager
       uri.scheme = URI.parse(proxy_config[:host]).scheme
       uri.host = URI.parse(proxy_config[:host]).host
       uri.port = proxy_config[:port].try(:to_s)
-      uri.user = proxy_config[:user].try(:to_s)
-      uri.password = proxy_config[:password].try(:to_s)
+      uri.user = proxy_config[:user]
+      uri.password = proxy_config[:password] if uri.user.present?
 
       RestClient.proxy = uri.to_s
     end

data/app/models/scc_account.rb

@@ -166,7 +166,8 @@ class SccAccount < ApplicationRecord
   def test_connection
     get_scc_data('/connect/organizations/subscriptions')
     true
-  rescue StandardError
+  rescue StandardError => e
+    ::Foreman::Logging.logger('foreman_scc_manager').warn "Error occurred while testing SCC-Connection to Account #{self}: #{e}"
     false
   end
 
@@ -185,10 +186,10 @@ class SccAccount < ApplicationRecord
       cached_repository.save!
       upstream_repo_ids << ur['id']
     end
-    logger.debug "Found #{upstream_repo_ids.length} repositories"
+    ::Foreman::Logging.logger('foreman_scc_manager').debug "Found #{upstream_repo_ids.length} repositories"
     # delete repositories beeing removed upstream
     to_delete = scc_repositories.where.not(scc_id: upstream_repo_ids)
-    logger.debug "Deleting #{to_delete.count} old repositories"
+    ::Foreman::Logging.logger('foreman_scc_manager').debug "Deleting #{to_delete.count} old repositories"
     to_delete.destroy_all
   end
 
@@ -208,10 +209,10 @@ class SccAccount < ApplicationRecord
       cached_product.save!
       upstream_product_ids << up['id']
     end
-    logger.debug "Found #{upstream_product_ids.length} products"
+    ::Foreman::Logging.logger('foreman_scc_manager').debug "Found #{upstream_product_ids.length} products"
     # delete products beeing removed upstream
     to_delete = scc_products.where.not(scc_id: upstream_product_ids)
-    logger.debug "Deleting #{to_delete.count} old products"
+    ::Foreman::Logging.logger('foreman_scc_manager').debug "Deleting #{to_delete.count} old products"
     to_delete.destroy_all
     # rewire product to product relationships
     upstream_products.each do |up|
@@ -219,7 +220,7 @@ class SccAccount < ApplicationRecord
       begin
         scc_products.find_by!(scc_id: up['id']).update!(scc_extensions: extensions)
       rescue ActiveRecord::RecordNotFound
-        logger.info "Failed to find parent scc_product '#{up['name']}'."
+        ::Foreman::Logging.logger('foreman_scc_manager').info "Failed to find parent scc_product '#{up['name']}'."
       end
     end
   end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.8.2'.freeze
+  VERSION = '1.8.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc