diff options
| author | Luke Kanies <luke@madstop.com> | 2008-01-19 14:08:44 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-01-19 14:08:44 -0600 |
| commit | 7a9aae84805e415de090f0ce9be04beb8435e117 (patch) | |
| tree | ce9dce02d11cd56066248439b8d5d5164aaf5b94 /lib/puppet/network | |
| parent | 20fb046c6631f129b222def85e386d2b3bb602a8 (diff) | |
| download | puppet-7a9aae84805e415de090f0ce9be04beb8435e117.tar.gz puppet-7a9aae84805e415de090f0ce9be04beb8435e117.tar.xz puppet-7a9aae84805e415de090f0ce9be04beb8435e117.zip | |
Wrapping the Resolv call in the mongrel server so if it
fails it doesn't kill the server.
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/http_server/mongrel.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/puppet/network/http_server/mongrel.rb b/lib/puppet/network/http_server/mongrel.rb index d6e21b189..d340f3d63 100644 --- a/lib/puppet/network/http_server/mongrel.rb +++ b/lib/puppet/network/http_server/mongrel.rb @@ -127,7 +127,12 @@ module Puppet::Network client = dn_matchdata[1].to_str valid = (params[Puppet[:ssl_client_verify_header]] == 'SUCCESS') else - client = Resolv.getname(ip) + begin + client = Resolv.getname(ip) + rescue => detail + Puppet.err "Could not resolve %s: %s" % [ip, detail] + client = "unknown" + end valid = false end |