ascension

commit 7fc4e8c067a398572929960e4b4f8a3c6553dbdd
parent dcbf85209aa709001467fe154ad0a8fe05e4aef2
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed,  1 May 2019 14:01:16 +0200

alpha renaming for sanity

Diffstat:
M
ascension/ascension.py
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/ascension/ascension.py b/ascension/ascension.py
@@ -174,12 +174,12 @@ class Ascender():
             return soa_record[2].serial
 
     @classmethod
-    def mirror_zone(cls, zoneserial=None):
+    def mirror_zone(cls, gns_zone_serial=None):
         """
         Extract necessary information from Generator
         """
-        currentserial = int(cls.get_dns_zone_serial(cls.domain, cls.transferns))
-        if zoneserial == 0:
+        dns_zone_serial = int(cls.get_dns_zone_serial(cls.domain, cls.transferns))
+        if gns_zone_serial == 0:
             logging.info("zone does not exist yet")
             cls.initial_zone_transfer()
             try:
@@ -188,21 +188,21 @@ class Ascender():
             except dns.zone.BadZone:
                 logging.critical("Malformed DNS Zone '%s'", cls.domain)
             cls.soa = cls.get_zone_soa(cls.zone)
-        elif zoneserial < currentserial:
+        elif gns_zone_serial < dns_zone_serial:
             logging.info("zone is out of date")
-            cls.initial_zone_transfer(serial=zoneserial)
+            cls.initial_zone_transfer(serial=gns_zone_serial)
             try:
                 cls.zone = dns.zone.from_xfr(cls.zonegenerator)
             except dns.zone.BadZone:
                 logging.critical("Malformed DNS Zone '%s'", cls.domain)
             cls.soa = cls.get_zone_soa(cls.zone)
-        elif zoneserial == currentserial:
+        elif gns_zone_serial == dns_zone_serial:
             logging.info("zone is up to date")
         # should be unnecessary but AXFR SOA might not be equal to direct SOA
         else:
             # because it runs as a daemon, ignore this case but log it
-            logging.warning("SOA serial is bigger than zone serial?")
-            logging.warning("zone: %s, current: %s", zoneserial, currentserial)
+            logging.warning("SOA serial in GNS is bigger than SOA serial in DNS?")
+            logging.warning("GNS zone: %s, DNS zone: %s", gns_zone_serial, dns_zone_serial)
 
     @classmethod
     def add_records_to_gns(cls):