Revision da5a9c4e
Added by Lukas Zapletal over 8 years ago
| lib/net/dns.rb | ||
|---|---|---|
|
# Returns: a new DNS record object, A or PTR accordingly
|
||
|
# We query DNS directly, as its faster then to query our own proxy.
|
||
|
def self.lookup(query, proxy, resolver = Resolv::DNS.new)
|
||
|
Timeout::timeout(3) do
|
||
|
Timeout::timeout(Setting[:dns_conflict_timeout]) do
|
||
|
if (query =~ Validations::IP_REGEXP)
|
||
|
n = resolver.getname(query).to_s
|
||
|
i = query
|
||
Also available in: Unified diff
Fixes #11709 - better error for DNS conflict timeouts