ascension

commit 66aad4a443545bda935cdcac06796b7a84afc840
parent 7bcf78798d798020d8b0a6ed8770e78024ec6e2e
Author: rexxnor <rexxnor+gnunet@brief.li>
Date:   Sat,  4 May 2019 17:35:52 +0200

fixed some minor bugs

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

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ascension/ascension.py b/ascension/ascension.py
@@ -498,7 +498,7 @@ class Ascender():
         try:
             serial = sp.check_output([GNUNET_GNS_COMMAND,
                                       '-t', 'SOA',
-                                      '-u', '@.%s' % self.domain,])
+                                      '-u', '%s' % self.domain,])
             serial = serial.decode()
         except sp.CalledProcessError:
             serial = ""
@@ -689,7 +689,8 @@ def main():
             ascender.zonegenerator = dns.query.xfr(ascender.transferns,
                                                    ascender.domain,
                                                    port=ascender.port)
-        dns_zone_serial = ascender.get_dns_zone_serial(ascender.domain, ascender.transferns)
+        dns_zone_serial = ascender.get_dns_zone_serial(ascender.domain,
+                                                       ascender.transferns)
         if not dns_zone_serial:
             logging.error("Could not get DNS zone serial")
             if standalone:
@@ -699,13 +700,13 @@ def main():
         if not gns_zone_serial:
             logging.info("GNS zone does not exist yet, performing full transfer.")
             ascender.bootstrap_zone()
-        elif int(gns_zone_serial) == int(dns_zone_serial):
+        elif gns_zone_serial == dns_zone_serial:
             logging.info("GNS zone is up to date.")
             if standalone:
                 return 0
             time.sleep(refresh)
             continue
-        elif int(gns_zone_serial) > int(dns_zone_serial):
+        elif gns_zone_serial > dns_zone_serial:
             logging.critical("SOA serial in GNS is bigger than SOA serial in DNS?")
             logging.critical("GNS zone: %s, DNS zone: %s", gns_zone_serial, dns_zone_serial)
             if standalone:
@@ -719,8 +720,8 @@ def main():
             ascender.zone = dns.zone.from_xfr(ascender.zonegenerator,
                                               check_origin=False)
             ascender.soa = ascender.get_zone_soa(ascender.zone)
-            refresh = int(ascender.soa[2]).split(" ")[4]
-            retry = int(ascender.soa[2]).split(" ")[5]
+            refresh = int(str(ascender.soa[2]).split(" ")[3])
+            retry = int(str(ascender.soa[2]).split(" ")[4])
         except dns.zone.BadZone:
             logging.critical("Malformed DNS Zone '%s'", ascender.domain)
             if standalone: