diff options
Diffstat (limited to 'lib/puppet/client.rb')
| -rw-r--r-- | lib/puppet/client.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/puppet/client.rb b/lib/puppet/client.rb index 06808a4b4..15d1edf83 100644 --- a/lib/puppet/client.rb +++ b/lib/puppet/client.rb @@ -27,11 +27,11 @@ module Puppet @nil = nil @url = hash[:Server] if hash.include?(:Listen) and hash[:Listen] == false - Puppet.notice "We're a local client" + Puppet.debug "We're a local client" @localonly = true @driver = @url else - Puppet.notice "We're a networked client" + Puppet.debug "We're a networked client" @localonly = false @driver = SOAP::RPC::Driver.new(@url, 'urn:puppet-server') @driver.add_method("getconfig", "name") @@ -39,7 +39,7 @@ module Puppet unless @localonly hash.delete(:Server) - Puppet.notice "Server is %s" % @url + Puppet.debug "Server is %s" % @url hash[:BindAddress] ||= "0.0.0.0" hash[:Port] ||= 17444 @@ -53,7 +53,7 @@ module Puppet def getconfig Puppet.debug "server is %s" % @url #client.loadproperty('files/sslclient.properties') - Puppet.notice("getting config") + Puppet.debug("getting config") objects = nil if @localonly objects = @driver.getconfig(self) @@ -68,7 +68,7 @@ module Puppet # for now, just descend into the tree and perform and necessary # manipulations def config(tree) - Puppet.notice("Calling config") + Puppet.debug("Calling config") container = Marshal::load(tree).to_type # this is a gross hack... but i don't see a good way around it @@ -83,15 +83,15 @@ module Puppet transaction.evaluate Puppet::Metric.gather Puppet::Metric.tally - Metric.store - if @@config[:rrdgraph] == true - #Metric.store + if Puppet[:rrdgraph] == true + Metric.store + Metric.graph end self.shutdown end def callfunc(name,args) - Puppet.notice("Calling callfunc on %s" % name) + Puppet.debug("Calling callfunc on %s" % name) if function = Puppet::Function[name] #Puppet.debug("calling function %s" % function) value = function.call(args) |