Changeset 425

Timestamp:

10/11/12 15:07:47 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak handling of log messages so that the location description
is logged, and only if there was one.

File:

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

trunk/DNSDB.pm

@@ -3537 +3537 @@
   $logdata{entry} .= " [priority $dist] [weight $weight] [port $port]"
         if $typemap{$$rectype} eq 'SRV';
-  $logdata{entry} .= "', TTL $ttl, location $location";
+  $logdata{entry} .= "', TTL $ttl";
+  $logdata{entry} .= ", location ".getLoc($dbh, $location)->{description} if $location;
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -3698 +3699 @@
   $logdata{entry} .= " [priority $oldrec->{distance}] [weight $oldrec->{weight}] [port $oldrec->{port}]"
         if $typemap{$oldrec->{type}} eq 'SRV';
-  $logdata{entry} .= "', TTL $oldrec->{ttl}, location $oldrec->{location}\nto\n";
+  $logdata{entry} .= "', TTL $oldrec->{ttl}";
+  $logdata{entry} .= ", location ".getLoc($dbh, $oldrec->{location})->{description} if $oldrec->{location};
+  $logdata{entry} .= "\nto\n";
   # More NS special
   if ($revrec eq 'y' && $$rectype == 2) {
@@ -3707 +3710 @@
   $logdata{entry} .= " [distance $dist]" if $typemap{$$rectype} eq 'MX';
   $logdata{entry} .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$$rectype} eq 'SRV';
-  $logdata{entry} .= "', TTL $ttl, location $location";
+  $logdata{entry} .= "', TTL $ttl";
+  $logdata{entry} .= ", location ".getLoc($dbh, $location)->{description} if $location;
 
   local $dbh->{AutoCommit} = 0;
@@ -3767 +3771 @@
   $logdata{entry} .= " [priority $oldrec->{distance}] [weight $oldrec->{weight}] [port $oldrec->{port}]"
         if $typemap{$oldrec->{type}} eq 'SRV';
-  $logdata{entry} .= "', TTL $oldrec->{ttl}\n";
+  $logdata{entry} .= "', TTL $oldrec->{ttl}";
+  $logdata{entry} .= ", location ".getLoc($dbh, $oldrec->{location})->{description} if $oldrec->{location};
 
   eval {