Changeset 781 for trunk

Timestamp:

08/13/19 17:46:19 (5 years ago)

Author:

Kris Deugau

Message:

/trunk

Move serial number tweaking into a sub for better maintainability. See #24.

File:

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

trunk/DNSDB.pm

@@ -494 +494 @@
 #  } elsif ($self->{log_channel} eq 'syslog') {
 #  }
-} # end _log
+} # end _log()
+
+## DNSDB::_updateserial()
+# Update the serial number on a forward and/or reverse zone, and flag it as changed
+# Takes a logdata hash
+sub _updateserial {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+
+  my %args = @_;
+
+##fixme:  add alternate serial schemes here
+
+  if ($args{rdns_id}) {
+    $dbh->do("UPDATE revzones SET changed = 'y',zserial = ? WHERE rdns_id = ?", undef, (scalar(time), $args{rdns_id}) );
+  }
+  if ($args{domain_id}) {
+    $dbh->do("UPDATE domains SET changed = 'y',zserial = ? WHERE domain_id = ?", undef, (scalar(time), $args{domain_id}) );
+  }
+} # end _updateserial()
 
 
@@ -4254 +4273 @@
         " retry $soa{retry}, expire $soa{expire}, minTTL $soa{minttl}, TTL $soa{ttl})";
     }
-    if ($revrec eq 'y') {
-      $dbh->do("UPDATE revzones SET changed = 'y',zserial = ? WHERE rdns_id = ?", undef, (scalar(time), $soa{id}) );
-    } else {
-      $dbh->do("UPDATE domains SET changed = 'y',zserial = ? WHERE domain_id = ?", undef, (scalar(time), $soa{id}) );
-    }
+    _updateserial(%logdata);
     $logdata{entry} = $msg;
     $self->_log(%logdata);
@@ -4607 +4622 @@
     $dbh->do("INSERT INTO "._rectable($defrec, $revrec)." ($fields) VALUES ($vallen)",
         undef, @vallist);
-    if ($revrec eq 'y') {
-      $dbh->do("UPDATE revzones SET changed = 'y',zserial = ? WHERE rdns_id = ?", undef, (scalar(time), $domid) );
-    } else {
-      $dbh->do("UPDATE domains SET changed = 'y',zserial = ? WHERE domain_id = ?", undef, (scalar(time), $domid) );
-    }
+    _updateserial(%logdata);
     $self->_log(%logdata);
     $dbh->commit;
@@ -4812 +4823 @@
   eval {
     $dbh->do("UPDATE "._rectable($defrec,$revrec)." SET $fields WHERE record_id=?", undef, (@vallist, $id) );
-    if ($revrec eq 'y') {
-      $dbh->do("UPDATE revzones SET changed = 'y',zserial = ? WHERE rdns_id = ?", undef, (scalar(time), $domid) );
-    } else {
-      $dbh->do("UPDATE domains SET changed = 'y',zserial = ? WHERE domain_id = ?", undef, (scalar(time), $domid) );
-    }
+    _updateserial(%logdata);
     $self->_log(%logdata);
     $dbh->commit;
@@ -4882 +4889 @@
   eval {
     $dbh->do("UPDATE records SET $delpar = ?, type = ? WHERE record_id = ?", undef, @sqlargs);
-    # both forward and reverse zones affected, more or less by definition
-    $dbh->do("UPDATE revzones SET changed = 'y',zserial = ? WHERE rdns_id = ?", undef, (scalar(time), $rec->{rdns_id}) );
-    $dbh->do("UPDATE domains SET changed = 'y',zserial = ? WHERE domain_id = ?", undef, (scalar(time), $rec->{domain_id}) );
+    # we have no %logdata in this sub
+    _updateserial(domain_id => $rec->{domain_id}, rdns_id => $rec->{rdns_id});
     $self->_log(domain_id => $rec->{domain_id}, rdns_id => $rec->{rdns_id},
         group_id => $self->parentID(id => $rec->{rdns_id}, type => 'revzone', revrec => 'y'),
@@ -4950 +4956 @@
       $logdata{entry} = "Error deleting ".($defrec eq 'y' ? 'default record' : 'record').
         " '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
+      _updateserial(%logdata);
       $self->_log(%logdata);
       $dbh->commit;
@@ -5520 +5527 @@
 #  status - active/inactive state flag (defaults to active)
 #  rwsoa - overwrite-SOA flag (defaults to off)
+#  keepserial - keep the upstream serial number even if we overwrite the rest of the SOA
 #  rwns - overwrite-NS flag (defaults to off, doesn't affect subdomain NS records)
 #  merge - flag to automerge A or AAAA records with matching PTR records