Changeset 285 for trunk

Timestamp:

03/22/12 17:23:00 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Move action logging for zone delete (deldom/delrevzone) into delZone()
See #35

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1352 +1352 @@
   local $dbh->{RaiseError} = 1;
 
+  my $msg = '';
   my $failmsg = '';
+  my $zone = ($revrec eq 'n' ? domainName($dbh, $zoneid) : revName($dbh, $zoneid));
+
+  # Set this up here since we may use if if $config{log_failures} is enabled
+  my %loghash;
+  $loghash{domain_id} = $zoneid if $revrec eq 'n';
+  $loghash{rdns_id} = $zoneid if $revrec eq 'y';
+  $loghash{group_id} = parentID($dbh,
+        (id => $zoneid, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec) );
 
   # Wrap all the SQL in a transaction
@@ -1383 +1392 @@
     }
 
+    $msg = "Deleted ".($revrec eq 'n' ? 'domain' : 'reverse zone')." $zone";
+    $loghash{entry} = $msg;
+    _log($dbh, %loghash);
+
     # once we get here, we should have suceeded.
     $dbh->commit;
@@ -1388 +1401 @@
 
   if ($@) {
-    my $msg = $@;
+    $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',"$failmsg: $msg");
+    $loghash{entry} = "Delete $zone: $failmsg: $msg";
+    _log($dbh, %loghash) if $config{log_failures};
+    $dbh->commit;       # since we enabled transactions earlier
+    return ('FAIL',"Delete $zone: $failmsg: $msg");
   } else {
-    return ('OK','OK');
+    return ('OK',$msg);
   }
 

trunk/dns.cgi

@@ -415 +415 @@
   } elsif ($webvar{del} eq 'ok') {
     my $pargroup = parentID($dbh, (id => $webvar{id}, type => 'domain', revrec => $webvar{revrec}));
-    my $dom = domainName($dbh, $webvar{id});
     my ($code,$msg) = delZone($dbh, $webvar{id}, $webvar{revrec});
     if ($code eq 'OK') {
-      logaction($webvar{id}, $session->param("username"), $pargroup, "Deleted domain $dom");
-      changepage(page => "domlist", resultmsg => "Deleted domain $dom");
+      changepage(page => "domlist", resultmsg => $msg);
     } else {
-      logaction($webvar{id}, $session->param("username"), $pargroup, "Failed to delete domain $dom ($msg)")
-        if $config{log_failures};
-      changepage(page => "domlist", errmsg => "Error deleting domain $dom: $msg");
+      changepage(page => "domlist", errmsg => $msg);
     }
 
@@ -528 +524 @@
     my ($code,$msg) = delZone($dbh, $webvar{id}, 'y');
     if ($code eq 'OK') {
-##fixme: logaction needs to take "domid OR revid" and some way to know which it is
-      logaction($webvar{id}, $session->param("username"), $pargroup, "Deleted reverse zone $zone");
-      changepage(page => "revzones", resultmsg => "Deleted reverse zone $zone");
+      changepage(page => "revzones", resultmsg => $msg);
     } else {
-      logaction($webvar{id}, $session->param("username"), $pargroup, "Failed to delete domain $zone ($msg)")
-        if $config{log_failures};
-#push @debugbits, "got back $code, $msg\n";
-      changepage(page => "revzones", errmsg => "Error deleting reverse zone $zone: $msg");
+      changepage(page => "revzones", errmsg => $msg);
     }