Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(PDB-1020) Remove 'puts' statements from PuppetDB terminus #1155

Merged
merged 1 commit into from Nov 14, 2014
Merged

(PDB-1020) Remove 'puts' statements from PuppetDB terminus #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion puppet/lib/puppet/util/puppetdb/command.rb
View file
Open in desktop
Expand Up @@ -73,7 +73,10 @@ def submit
# compatibility.) We should either be using a nested exception or calling
# Puppet::Util::Logging#log_exception or #log_and_raise here; w/o them
# we lose context as to where the original exception occurred.
puts e, e.backtrace if Puppet[:trace]
if Puppet[:trace]
Puppet.err(e)
Puppet.err(e.backtrace)
end
raise Puppet::Util::Puppetdb::CommandSubmissionError.new(e.message, {:command => command, :for_whom => for_whom})
end
end
Expand Down
2 changes: 1 addition & 1 deletion puppet/lib/puppet/util/puppetdb/config.rb
View file
Open in desktop
Expand Up @@ -75,8 +75,8 @@ def self.load(config_file = nil)

self.new(config_hash, uses_server_urls)
rescue => detail
puts detail.backtrace if Puppet[:trace]
Puppet.warning "Could not configure PuppetDB terminuses: #{detail}"
Puppet.warning detail.backtrace if Puppet[:trace]
raise
end

Expand Down