Changeset 290 for trunk

Timestamp:

03/27/12 14:57:39 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Move action logging for delRec() into DNSDB.pm. See #35

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -2694 +2694 @@
   my $id = shift;
 
-  my $sth = $dbh->prepare("DELETE FROM "._rectable($defrec,$revrec)." WHERE record_id=?");
-  $sth->execute($id);
-
-  return ('FAIL',"Couldn't remove record: ".$sth->errstr) if $sth->err;
-
-  return ('OK','OK');
+  my $oldrec = getRecLine($dbh, $defrec, $revrec, $id);
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  # Put together the log entry
+  my %logdata;
+  $logdata{domain_id} = $oldrec->{domain_id};
+  $logdata{rdns_id} = $oldrec->{rdns_id};
+  $logdata{group_id} = $oldrec->{group_id} if $defrec eq 'y';
+  $logdata{group_id} = parentID($dbh,
+                (id => $oldrec->{domain_id}, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) )
+        if $defrec eq 'n';
+  $logdata{entry} = "Deleted ".($defrec eq 'y' ? 'default record ' : 'record ').
+        "'$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}";
+  $logdata{entry} .= " [distance $oldrec->{distance}]" if $typemap{$oldrec->{type}} eq 'MX';
+  $logdata{entry} .= " [priority $oldrec->{distance}] [weight $oldrec->{weight}] [port $oldrec->{port}]"
+        if $typemap{$oldrec->{type}} eq 'SRV';
+  $logdata{entry} .= "', TTL $oldrec->{ttl}\n";
+
+  eval {
+    my $sth = $dbh->do("DELETE FROM "._rectable($defrec,$revrec)." WHERE record_id=?", undef, ($id));
+    _log($dbh, %logdata);
+    $dbh->commit;
+  };
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      $logdata{entry} = "Error deleting ".($defrec eq 'y' ? 'default record' : 'record').
+        " '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
+      _log($dbh, %logdata);
+      $dbh->commit;
+    }
+    return ('FAIL', $msg);
+  }
+
+  return ('OK',$logdata{entry});
 } # end delRec()
 

trunk/dns.cgi

@@ -780 +780 @@
     $page->param(recval => $rec->{val});
   } elsif ($webvar{del} eq 'ok') {
-# get rec data before we try to delete it
-    my $rec = getRecLine($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
     my ($code,$msg) = delRec($dbh, $webvar{defrec}, $webvar{revrec}, $webvar{id});
     if ($code eq 'OK') {
-      if ($webvar{defrec} eq 'y') {
-        my $recclass = ($webvar{revrec} eq 'n' ? 'default record' : 'default reverse record');
-##fixme:  log distance for MX;  log port/weight/distance for SRV
-        my $restr = "Deleted $recclass '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
-        logaction(0, $session->param("username"), $rec->{parid}, $restr);
-        changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
-                revrec => $webvar{revrec}, resultmsg => $restr);
-      } else {
-        my $recclass = ($webvar{revrec} eq 'n' ? 'record' : 'reverse record');
-        my $restr = "Deleted $recclass '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl}";
-        logaction($rec->{parid}, $session->param("username"),
-                parentID($dbh, (id => $rec->{parid}, type => 'domain', revrec => $webvar{revrec})),
-                $restr);
-        changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
-                revrec => $webvar{revrec}, resultmsg => $restr);
-      }
+      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
+                revrec => $webvar{revrec}, resultmsg => $msg);
     } else {
 ## need to find failure mode
-      if ($config{log_failures}) {
-        if ($webvar{defrec} eq 'y') {
-          logaction(0, $session->param("username"), $rec->{parid},
-                "Failed deleting default record '$rec->{host} $typemap{$rec->{type}} $rec->{val}',".
-                " TTL $rec->{ttl} ($msg)");
-        } else {
-          logaction($rec->{parid}, $session->param("username"),
-                parentID($dbh, (id => $rec->{parid}, type => 'domain', revrec => $webvar{revrec})),
-                "Failed deleting record '$rec->{host} $typemap{$rec->{type}} $rec->{val}', TTL $rec->{ttl} ($msg)");
-        }
-      }
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
-                revrec => $webvar{revrec}, errmsg => "Error deleting record: $msg");
+                revrec => $webvar{revrec}, errmsg => $msg);
     }
   } else {