diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-13 12:24:08 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-09-07 12:44:11 +1000 |
| commit | e91a8cc975216501f764f5f2dea40d72154dc426 (patch) | |
| tree | 066c339736a124d13a88d0b064da41d9f16036d6 /lib/puppet | |
| parent | 4d36a5152ac8e183f04bdbc6e8a7d3cdbb5ba8ce (diff) | |
| download | puppet-e91a8cc975216501f764f5f2dea40d72154dc426.tar.gz puppet-e91a8cc975216501f764f5f2dea40d72154dc426.tar.xz puppet-e91a8cc975216501f764f5f2dea40d72154dc426.zip | |
[#4462] uncaught Timeout::Error
puppet agent was not catching all species of exceptions, causing it to
crash on net/http timeout errors.
This patch broadens the types of exceptions that are caught.
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/agent.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/agent.rb b/lib/puppet/agent.rb index 52acc64aa..47dd44a0e 100644 --- a/lib/puppet/agent.rb +++ b/lib/puppet/agent.rb @@ -37,7 +37,9 @@ class Puppet::Agent with_client do |client| begin sync.synchronize { lock { result = client.run(*args) } } - rescue => detail + rescue SystemExit,NoMemoryError + raise + rescue Exception => detail puts detail.backtrace if Puppet[:trace] Puppet.err "Could not run #{client_class}: #{detail}" end |