diff options
Diffstat (limited to 'lib/puppet/networkclient.rb')
| -rw-r--r-- | lib/puppet/networkclient.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/puppet/networkclient.rb b/lib/puppet/networkclient.rb index f093292f2..6284416e3 100644 --- a/lib/puppet/networkclient.rb +++ b/lib/puppet/networkclient.rb @@ -23,8 +23,8 @@ rescue LoadError => detail end module Puppet - class NetworkClientError < RuntimeError; end - class ClientError < RuntimeError; end + class NetworkClientError < Puppet::Error; end + class ClientError < Puppet::Error; end #--------------------------------------------------------------- if $noclientnetworking Puppet.err "Could not load client network libs: %s" % $noclientnetworking @@ -80,16 +80,17 @@ module Puppet [@host, @port] raise NetworkClientError, msg rescue SocketError => detail - Puppet.err "Could not find server %s" % @puppetserver - exit(12) + error = NetworkClientError.new( + "Could not find server %s" % @puppetserver + ) + error.set_backtrace detail.backtrace + raise error rescue => detail Puppet.err "Could not call %s.%s: %s" % [namespace, method, detail.inspect] - #raise NetworkClientError.new(detail.to_s) - if Puppet[:trace] - puts detail.backtrace - end - raise + error = NetworkClientError.new(detail.to_s) + error.set_backtrace detail.backtrace + raise error end } } |