diff options
| author | Luke Kanies <luke@madstop.com> | 2005-06-28 04:15:48 +0000 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2005-06-28 04:15:48 +0000 |
| commit | b6b1f5a8f08859d6c3975beb3ecbcd39ff5f250e (patch) | |
| tree | 5a3998d34392cf94472c23cad8df9b0b5e1a7351 /lib/puppet.rb | |
| parent | e3c32834c4cc5f7e378d2929b99253982ca264d8 (diff) | |
logging now exactly supports the list of levels that syslog supports, and multiple destinations (syslog, files, and console) are now supported
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@311 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet.rb')
| -rw-r--r-- | lib/puppet.rb | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 5daa2b1a6..c144a6bb4 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -3,17 +3,10 @@ # $Id$ require 'singleton' +require 'puppet/log' # XXX see the bottom of the file for further inclusions -PINK="[0;31m" -GREEN="[0;32m" -YELLOW="[0;33m" -SLATE="[0;34m" -ORANGE="[0;35m" -BLUE="[0;36m" -RESET="[0m" - #------------------------------------------------------------ # the top-level module # @@ -31,32 +24,18 @@ module Puppet @@config[:statefile] = "/var/puppet/log/state" - loglevels = [:debug,:verbose,:notice,:warning,:error] - # handle the different message levels # XXX this should be redone to treat log-levels like radio buttons # pick one, and it and all above it will be logged - loglevels.each { |level| + Puppet::Log.levels.each { |level| define_method(level,proc { |args| - Puppet.message(level,args) + Puppet::Log.create(level,args) }) module_function level # default to enabling all notice levels except debug - @@config[level] = true unless level == :debug + @@config[level] = true unless level == :notice } - def Puppet.message(level,*ary) - msg = ary.join(" ") - - if @@config[level] - Puppet::Message.new( - :level => level, - :source => "Puppet", - :message => msg - ) - end - end - # set up our configuration def Puppet.init(args) args.each {|p,v| @@ -64,12 +43,6 @@ module Puppet } end - # just print any messages we get - # we should later behave differently depending on the message - def Puppet.newmessage(msg) - puts msg - end - # configuration parameter access and stuff def Puppet.[](param) return @@config[param] @@ -83,5 +56,4 @@ module Puppet end require 'puppet/storage' -require 'puppet/message' require 'puppet/type' |