Merge pull request #42 from DavidS/improve-logging

Improve logging output
puppetlabs · Mar 23, 2018 · 33b8be4 · 33b8be4
2 parents e769188 + 95b038f
commit 33b8be4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/lib/puppet/resource_api/puppet_context.rb b/lib/puppet/resource_api/puppet_context.rb
@@ -2,14 +2,9 @@
 require 'puppet/util/logging'
 
 class Puppet::ResourceApi::PuppetContext < Puppet::ResourceApi::BaseContext
-  # declare a separate class to encapsulate Puppet's logging facilities
-  class PuppetLogger
-    extend Puppet::Util::Logging
-  end
-
   protected
 
   def send_log(level, message)
-    PuppetLogger.send_log(level, message)
+    Puppet::Util::Log.create(level: level, message: message)
   end
 end
diff --git a/spec/puppet/resource_api/puppet_context_spec.rb b/spec/puppet/resource_api/puppet_context_spec.rb
@@ -5,7 +5,7 @@
 
   describe '#warning(msg)' do
     it 'calls the Puppet logging infrastructure' do
-      expect(Puppet::ResourceApi::PuppetContext::PuppetLogger).to receive(:send_log).with(:warning, match(%r{message}))
+      expect(Puppet::Util::Log).to receive(:create).with(level: :warning, message: match(%r{message}))
       context.warning('message')
     end
   end