diff options
Diffstat (limited to 'lib/puppet/server')
| -rwxr-xr-x | lib/puppet/server/logger.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/server/servlet.rb | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/puppet/server/logger.rb b/lib/puppet/server/logger.rb index 7afad92b9..0ee2d75f0 100755 --- a/lib/puppet/server/logger.rb +++ b/lib/puppet/server/logger.rb @@ -27,13 +27,8 @@ class Server # :nodoc: if client if ! message.source or message.source == "Puppet" - #unless message.source or message.source != "Puppet" message.source = client - else - puts message.source.inspect end - else - puts "No client" end Puppet::Log.newmessage(message) diff --git a/lib/puppet/server/servlet.rb b/lib/puppet/server/servlet.rb index 4474fa640..f0b32efb0 100644 --- a/lib/puppet/server/servlet.rb +++ b/lib/puppet/server/servlet.rb @@ -153,9 +153,11 @@ class Server if nameary.nil? Puppet.warning "Could not retrieve server name from cert" else - Puppet.debug "Overriding %s with cert name %s" % - [@client, nameary[1]] - @client = nameary[1] + unless @client == nameary[1] + Puppet.debug "Overriding %s with cert name %s" % + [@client, nameary[1]] + @client = nameary[1] + end end end #if request.server_cert |