diff options
Diffstat (limited to 'lib/puppet.rb')
| -rw-r--r-- | lib/puppet.rb | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index a78853a10..3c5eebb0c 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -9,7 +9,6 @@ require 'singleton' require 'facter' require 'puppet/error' require 'puppet/util' -require 'puppet/util/log' require 'puppet/util/autoload' require 'puppet/util/settings' require 'puppet/util/feature' @@ -42,23 +41,9 @@ module Puppet # The services running in this process. @services ||= [] - # define helper messages for each of the message levels - Puppet::Util::Log.eachlevel { |level| - define_method(level,proc { |args| - if args.is_a?(Array) - args = args.join(" ") - end - Puppet::Util::Log.create( - :level => level, - :message => args - ) - }) - module_function level - } - - # I keep wanting to use Puppet.error - # XXX this isn't actually working right now - alias :error :err + require 'puppet/util/logging' + + extend Puppet::Util::Logging # The feature collection @features = Puppet::Util::Feature.new('puppet/feature') |