summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBatch User <batch@domaintools.com>2014-02-20 11:51:56 -0800
committerBob Halley <halley@dnspython.org>2014-08-31 16:27:44 -0700
commit31a95491c76bca5eb355de06d918ae5f39588ade (patch)
tree3ea2065bfccf48c6dd2a091cdd1ddebf823230fc
parentab853d428c547fb736950491e05667d388a04fab (diff)
downloaddnspython-31a95491c76bca5eb355de06d918ae5f39588ade.tar.gz
add options rotate handling
for resolv.conf "options rotate" line, enable shuffling of nameservers before each query. (should just rotate start position and maintain order?).
-rw-r--r--dns/resolver.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/dns/resolver.py b/dns/resolver.py
index 2d28f70..97bd0a8 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -21,6 +21,7 @@
import socket
import sys
import time
+import random
try:
import threading as _threading
@@ -510,6 +511,7 @@ class Resolver(object):
self.cache = None
self.flags = None
self.retry_servfail = False
+ self.rotate = False
def read_resolv_conf(self, f):
"""Process f as a file in the /etc/resolv.conf format. If f is
@@ -540,6 +542,9 @@ class Resolver(object):
elif tokens[0] == 'search':
for suffix in tokens[1:]:
self.search.append(dns.name.from_text(suffix))
+ elif tokens[0] == 'options':
+ if len(tokens) == 2 and tokens[1] == 'rotate':
+ self.rotate = True
finally:
if want_close:
f.close()
@@ -808,6 +813,8 @@ class Resolver(object):
# make a copy of the servers list so we can alter it later.
#
nameservers = self.nameservers[:]
+ if self.rotate:
+ random.shuffle(nameservers)
backoff = 0.10
while response is None:
if len(nameservers) == 0: