aboutsummaryrefslogtreecommitdiff
path: root/ascension
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-05-01 14:01:16 +0200
committerChristian Grothoff <christian@grothoff.org>2019-05-01 14:01:16 +0200
commit7fc4e8c067a398572929960e4b4f8a3c6553dbdd (patch)
tree774ddc8194cd43cf7cbbba2b4aeac7abe0ffe707 /ascension
parentdcbf85209aa709001467fe154ad0a8fe05e4aef2 (diff)
downloadascension-7fc4e8c067a398572929960e4b4f8a3c6553dbdd.tar.gz
ascension-7fc4e8c067a398572929960e4b4f8a3c6553dbdd.zip
alpha renaming for sanity
Diffstat (limited to 'ascension')
-rw-r--r--ascension/ascension.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/ascension/ascension.py b/ascension/ascension.py
index 57e51fb..1366020 100644
--- a/ascension/ascension.py
+++ b/ascension/ascension.py
@@ -174,12 +174,12 @@ class Ascender():
174 return soa_record[2].serial 174 return soa_record[2].serial
175 175
176 @classmethod 176 @classmethod
177 def mirror_zone(cls, zoneserial=None): 177 def mirror_zone(cls, gns_zone_serial=None):
178 """ 178 """
179 Extract necessary information from Generator 179 Extract necessary information from Generator
180 """ 180 """
181 currentserial = int(cls.get_dns_zone_serial(cls.domain, cls.transferns)) 181 dns_zone_serial = int(cls.get_dns_zone_serial(cls.domain, cls.transferns))
182 if zoneserial == 0: 182 if gns_zone_serial == 0:
183 logging.info("zone does not exist yet") 183 logging.info("zone does not exist yet")
184 cls.initial_zone_transfer() 184 cls.initial_zone_transfer()
185 try: 185 try:
@@ -188,21 +188,21 @@ class Ascender():
188 except dns.zone.BadZone: 188 except dns.zone.BadZone:
189 logging.critical("Malformed DNS Zone '%s'", cls.domain) 189 logging.critical("Malformed DNS Zone '%s'", cls.domain)
190 cls.soa = cls.get_zone_soa(cls.zone) 190 cls.soa = cls.get_zone_soa(cls.zone)
191 elif zoneserial < currentserial: 191 elif gns_zone_serial < dns_zone_serial:
192 logging.info("zone is out of date") 192 logging.info("zone is out of date")
193 cls.initial_zone_transfer(serial=zoneserial) 193 cls.initial_zone_transfer(serial=gns_zone_serial)
194 try: 194 try:
195 cls.zone = dns.zone.from_xfr(cls.zonegenerator) 195 cls.zone = dns.zone.from_xfr(cls.zonegenerator)
196 except dns.zone.BadZone: 196 except dns.zone.BadZone:
197 logging.critical("Malformed DNS Zone '%s'", cls.domain) 197 logging.critical("Malformed DNS Zone '%s'", cls.domain)
198 cls.soa = cls.get_zone_soa(cls.zone) 198 cls.soa = cls.get_zone_soa(cls.zone)
199 elif zoneserial == currentserial: 199 elif gns_zone_serial == dns_zone_serial:
200 logging.info("zone is up to date") 200 logging.info("zone is up to date")
201 # should be unnecessary but AXFR SOA might not be equal to direct SOA 201 # should be unnecessary but AXFR SOA might not be equal to direct SOA
202 else: 202 else:
203 # because it runs as a daemon, ignore this case but log it 203 # because it runs as a daemon, ignore this case but log it
204 logging.warning("SOA serial is bigger than zone serial?") 204 logging.warning("SOA serial in GNS is bigger than SOA serial in DNS?")
205 logging.warning("zone: %s, current: %s", zoneserial, currentserial) 205 logging.warning("GNS zone: %s, DNS zone: %s", gns_zone_serial, dns_zone_serial)
206 206
207 @classmethod 207 @classmethod
208 def add_records_to_gns(cls): 208 def add_records_to_gns(cls):