From 1da98a44974c6deeda5c101acdf06af2e1ad227e Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Tue, 27 Nov 2018 22:18:59 -0500 Subject: [PATCH] Print better information when AXFR fails --- node-daemon/pvcd/DNSAggregatorInstance.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/node-daemon/pvcd/DNSAggregatorInstance.py b/node-daemon/pvcd/DNSAggregatorInstance.py index d43d9eac..8f7afaa5 100644 --- a/node-daemon/pvcd/DNSAggregatorInstance.py +++ b/node-daemon/pvcd/DNSAggregatorInstance.py @@ -288,10 +288,11 @@ class AXFRDaemonInstance(object): # Get an AXFR from the dnsmasq instance and list of records try: - z = dns.zone.from_xfr(dns.query.xfr(dnsmasq_ip, domain, lifetime=5.0)) + axfr = dns.query.xfr(dnsmasq_ip, domain, lifetime=5.0) + z = dns.zone.from_xfr(axfr) records_raw = [z[n].to_text(n) for n in z.nodes.keys()] except OSError as e: - print('{} ({})'.format(e, domain)) + print('{} {} ({})'.format(e, dnsmasq_ip, domain)) continue # Fix the formatting because it's useless