Changeset 645

Timestamp:

06/11/14 17:46:24 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend mergerecs with --detail option; now it defaults to only logging
a single generic entry for the actions taken rather than logging each
record merge separately. Also print the log messages to the console.

File:

• trunk/mergerecs (modified) (3 diffs)

trunk/mergerecs

@@ -35 +35 @@
 
 sub usage {
-  die qq(usage:  mergerecs zone [domain]
-    zone  The zone to walk for PTR or A/AAAA records to try to merge.
-          Using a reverse zone (either CIDR or in-addr.arpa) will
-          likely behave more consistently.
+  die qq(usage:  mergerecs zone [domain] [--detail]
+    zone  The zone to walk for PTR records to try to merge.
   domain  Optionally restrict record merges to a specified domain as well.
-          Ignored if zone is a domain.
+ --detail Optional argument to add one log entry for each A+PTR pair merged
+          instead of a single generic entry.
 );
 }
 
-my $pzone = $ARGV[0];
-my $matchdom = $ARGV[1] || '';
+my $logdetail = 0;
+my $matchdom = '';
+
+my $pzone = shift @ARGV;
+if (@ARGV) {
+  if ($ARGV[0] eq '--detail') {
+    $logdetail = 1;
+  } else {
+    $matchdom = shift @ARGV;
+    $logdetail = 1 if @ARGV && $ARGV[0] eq '--detail';
+  }
+}
 
 my $dnsdb = new DNSDB or die "Couldn't create DNSDB object: ".$DNSDB::errstr."\n";
@@ -124 +133 @@
         $mergesth->execute($erdns, $ettl, $etype, $id);
         $delsth->execute($erid);
-        $dnsdb->_log(group_id => $group, domain_id => $zid, rdns_id => $erdns, entry => $logentry);
-      }
+        if ($logdetail) {
+          $dnsdb->_log(group_id => $group, domain_id => $zid, rdns_id => $erdns, entry => $logentry);
+          print "$logentry\n";
+        }
+      }
+      $nrecs++;
+    } # while
+    if (!$logdetail) {
+      $dnsdb->_log(group_id => $group, domain_id => $zid,
+        entry => "Merged $nrecs A and AAAA records in $pzone with matching PTRs");
     }
+    print "Merged $nrecs A and AAAA records in $pzone with matching PTRs\n";
 
   } else {
-    # merge records in a forward zone
+    # merge records in a reverse zone
     my $reclist = $dbh->prepare("SELECT host,val,type,record_id,ttl,location FROM records ".
         "WHERE type=12 AND rdns_id = ?");
@@ -159 +177 @@
         $mergesth->execute($edid, $ettl, $ntype, $id);
         $delsth->execute($erid);
-        $dnsdb->_log(group_id => $group, domain_id => $edid, rdns_id => $zid, entry => $logentry);
-      }
+        if ($logdetail) {
+          $dnsdb->_log(group_id => $group, domain_id => $edid, rdns_id => $zid, entry => $logentry);
+          print "$logentry\n";
+        }
+      }
+      $nrecs++;
     } # while
+    my $entry = "Merged $nrecs PTR records in $pzone with matching A or AAAA records".($fzid ? " in $matchdom" : '');
+    if (!$logdetail) {
+      if ($fzid) {
+        $dnsdb->_log(group_id => $group, domain_id => $fzid, rdns_id => $zid, entry => $entry);
+      } else {
+        $dnsdb->_log(group_id => $group, rdns_id => $zid, entry => $entry);
+      }
+    }
+    print "$entry\n";
   } # else
   $dbh->commit;