Merge pull request #12996 from bdunne/update_ansible_tower_client

Ensure AnsibleTowerClient.logger is set to $log not a NullLogger
ManageIQ · Dec 6, 2016 · db4e219 · db4e219
2 parents 32cce6a + 0366af1
commit db4e219
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -25,7 +25,7 @@ gem "actioncable",                    "~>5.0.0"
 gem "acts_as_list",                   "~>0.7.2"
 gem "acts_as_tree",                   "~>2.1.0" # acts_as_tree needs to be required so that it loads before ancestry
 gem "ancestry",                       "~>2.2.1",       :require => false
-gem "ansible_tower_client",           "~>0.4.0",       :require => false
+gem "ansible_tower_client",           "~>0.4.1",       :require => false
 gem "aws-sdk",                        "~>2",           :require => false
 gem "color",                          "~>1.8"
 gem "config",                         "~>1.3.0",       :require => false

diff --git a/app/models/manageiq/providers/ansible_tower/provider.rb b/app/models/manageiq/providers/ansible_tower/provider.rb
@@ -14,7 +14,7 @@ class ManageIQ::Providers::AnsibleTower::Provider < ::Provider
 
   def self.raw_connect(base_url, username, password, verify_ssl)
     require 'ansible_tower_client'
-    AnsibleTowerClient.logger ||= $log
+    AnsibleTowerClient.logger = $log
     AnsibleTowerClient::Connection.new(
       :base_url   => base_url,
       :username   => username,