Changeset 792

Timestamp:

10/21/20 13:49:40 (4 years ago)

Author:

Kris Deugau

Message:

/trunk

Refine and lightly reorder logic for automatically bumpering the serial
and forcing fresh data to be exported

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -6293 +6293 @@
 
       # write fresh records if:
+      #  - the zone contains ALIAS pseudorecords, which need to cascade changes from the upstream CNAME farm at every opportunity
+      if ( ($dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = ? AND type=65300", undef, $domid))[0] ) {
+        $changed = 1;  # abuse this flag for zones with ALIAS records
+        # also update the serial number, because while it shouldn't matter purely for serving
+        # records, it WILL matter if AXFR becomes part of the publishing infrastructure
+        $self->_updateserial(domain_id => $domid);
+      }
+      #  - the zone contains records which expire in less than 10 minutes or became valid less than 10 minutes ago
+      # note, no need to multi-bump the serial
+      elsif ( ($dbh->selectrow_array("SELECT COUNT(*) FROM records WHERE domain_id = ? AND ".
+              "stampactive='t' AND @(extract(epoch from stamp-now())) < 600", undef, $domid))[0] ) {
+        $changed = 1;
+        $self->_updateserial(domain_id => $domid);
+      }
       #  - we are not using the cache
       #  - force_refresh is set
@@ -6298 +6312 @@
       #  - the cache file does not exist
       #  - the cache file is empty
-      #  - the zone contains ALIAS pseudorecords, which need to cascade changes from the upstream CNAME farm at every opportunity
-      if ( ($dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = ? AND type=65300", undef, $domid))[0] ) {
-        $changed = 1;  # abuse this flag for zones with ALIAS records
-      }
       if (!$self->{usecache} || $self->{force_refresh} || $changed || !-e $cachefile || -z $cachefile) {
         if ($self->{usecache}) {