summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Paul Searles <daniel@flowboard.com>2014-06-25 12:55:29 -0700
committerDaniel Paul Searles <daniel@flowboard.com>2014-06-25 12:55:29 -0700
commite5b09da9f589dc4327e962e29673117e7125e961 (patch)
tree132ac7c168e3d7c0d3389b4fa00533c84627b89f
parentea92ea9b6ee007c8d6cdc2b3768a024b2e3fbf09 (diff)
downloadohai-e5b09da9f589dc4327e962e29673117e7125e961.tar.gz
Catch specific Resolv exceptions when getting hostname for rackspace.
-rw-r--r--lib/ohai/plugins/rackspace.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ohai/plugins/rackspace.rb b/lib/ohai/plugins/rackspace.rb
index 7926df79..6b72e2c1 100644
--- a/lib/ohai/plugins/rackspace.rb
+++ b/lib/ohai/plugins/rackspace.rb
@@ -133,7 +133,7 @@ Ohai.plugin(:Rackspace) do
unless rackspace[:public_ip].nil?
rackspace[:public_hostname] = begin
Resolv.getname(rackspace[:public_ip])
- rescue
+ rescue Resolv::ResolvError, Resolv::ResolvTimeout
rackspace[:public_ip]
end
end