Added better debug output.

1 files changed, 4 insertions, 4 deletions

diff --git a/dnscheck_nsd.py b/dnscheck_nsd.py
index bd875e0..c5130c3 100644
--- a/dnscheck_nsd.py
+++ b/dnscheck_nsd.py
@@ -18,7 +18,6 @@ logger.addHandler(ch)
 VERBOSE = False
 
 def get_resolver(nameserver=None, lifetime=30):
-    logger.debug('Resolver instance with nameserver %s.' % nameserver)
     if not nameserver:
         resolver = dns.resolver.Resolver()
     else:
@@ -31,6 +30,7 @@ def get_resolver(nameserver=None, lifetime=30):
             except gaierror:
                 logger.error('Could not find nameserver: %s' % nameserver)
                 sys.exit(1)
+    logger.debug('Resolver instance with nameserver %s.' % resolver.nameservers[0])
     resolver.lifetime = lifetime
     return resolver
 
@@ -41,7 +41,7 @@ def compare_soa(zone, resolvers):
             answer = resolver.query(zone, 'SOA')[0]
             if VERBOSE:
                 if resolver.nameservers[0] == '127.0.0.1' or resolver.nameservers[0] == '::1':
-                    logger.info('NS localhost: %s' % answer)
+                    logger.info('NS %s: %s' % (resolver.nameservers[0], answer))
                 else:
                     logger.info('NS %s: %s' % (gethostbyaddr(resolver.nameservers[0])[0], answer))
         except dns.exception.Timeout:
@@ -64,7 +64,7 @@ def print_soa(zone, resolvers):
         try:
             answer = resolver.query(zone, 'SOA')[0]
             if resolver.nameservers[0] == '127.0.0.1' or resolver.nameservers[0] == '::1':
-                print 'NS localhost: %s' % answer
+                print 'NS %s: %s' % (resolver.nameservers[0], answer)
             else:
                 print 'NS %s: %s' % (gethostbyaddr(resolver.nameservers[0])[0], answer)
         except dns.exception.Timeout:
@@ -102,7 +102,7 @@ def parse_file(f):
 def main():
     # User friendly usage output
     parser = argparse.ArgumentParser()
-    parser.add_argument('--nameserver', '-ns', type=str, default='', help="IP address or hostname, default localhost")
+    parser.add_argument('--nameserver', '-ns', default=None, help="IP address or hostname, default localhost")
     parser.add_argument('--timeout', '-t', type=float, default=5, help="timeout in seconds, default 5")
     parser.add_argument('--verbose', '-v', action='store_true', default=False)
     parser.add_argument('--debug', action='store_true', default=False)