summaryrefslogtreecommitdiff
path: root/lib/facter/facter_dot_d.rb
diff options
context:
space:
mode:
authorHelen <helen@puppetlabs.com>2016-04-15 13:29:23 +0100
committerHelen <helen@puppetlabs.com>2016-04-15 13:29:23 +0100
commitd9f65387c99c99177f94075fc840e7c574e07417 (patch)
treee2b1bf7362973650efdcac0a3be68df7d9bae8f6 /lib/facter/facter_dot_d.rb
parent29961218a74bfdae96371c42a3c336e714c79a93 (diff)
parent085035dccebbf27cf2bfd7f1d9101c746f5178a2 (diff)
Merge pull request #595 from tphoney/4.12.0_release
master to 4.12.x
Diffstat (limited to 'lib/facter/facter_dot_d.rb')
-rw-r--r--lib/facter/facter_dot_d.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/facter/facter_dot_d.rb b/lib/facter/facter_dot_d.rb
index d85940d..5c5fb1f 100644
--- a/lib/facter/facter_dot_d.rb
+++ b/lib/facter/facter_dot_d.rb
@@ -48,7 +48,7 @@ class Facter::Util::DotD
end
end
end
- rescue Exception => e
+ rescue StandardError => e
Facter.warn("Failed to handle #{file} as text facts: #{e.class}: #{e}")
end
@@ -65,7 +65,7 @@ class Facter::Util::DotD
setcode { v }
end
end
- rescue Exception => e
+ rescue StandardError => e
Facter.warn("Failed to handle #{file} as json facts: #{e.class}: #{e}")
end
@@ -77,7 +77,7 @@ class Facter::Util::DotD
setcode { v }
end
end
- rescue Exception => e
+ rescue StandardError => e
Facter.warn("Failed to handle #{file} as yaml facts: #{e.class}: #{e}")
end
@@ -106,7 +106,7 @@ class Facter::Util::DotD
end
end
end
- rescue Exception => e
+ rescue StandardError => e
Facter.warn("Failed to handle #{file} as script facts: #{e.class}: #{e}")
Facter.debug(e.backtrace.join("\n\t"))
end