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.

Signed-off-by: Jesse Wolfe <[email protected]>
---
 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 52acc64..47dd44a 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
-- 
1.7.0.4

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to