Changeset 23 for trunk

Timestamp:

10/20/09 14:47:36 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint

• basic group management functional
• add readable failure messages on domain/group delete

Location:

trunk

Files:

• DNSDB.pm (modified) (6 diffs)
• dns.cgi (modified) (4 diffs)
• templates/delgrp.tmpl (modified) (2 diffs)
• templates/grpman.tmpl (modified) (2 diffs)

trunk/DNSDB.pm

@@ -226 +226 @@
   local $dbh->{RaiseError} = 1;
 
+  my $failmsg = '';
+
   # Wrap all the SQL in a transaction
   eval {
     my $sth = $dbh->prepare("delete from records where domain_id=?");
+    $failmsg = "Failure removing domain records";
     $sth->execute($domid);
     $sth = $dbh->prepare("delete from domains where domain_id=?");
+    $failmsg = "Failure removing domain";
     $sth->execute($domid);
 
-#die "full of fail\n";
     # once we get here, we should have suceeded.
-#    $dbh->commit;
+    $dbh->commit;
   }; # end eval
 
@@ -241 +244 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',$msg);
+    return ('FAIL',"$failmsg: $msg");
   } else {
     return ('OK','OK');
@@ -340 +343 @@
 
 ##fixme:  locate "knowable" error conditions and deal with them before the eval
+# ... or inside, whatever.
 # -> domains still exist in group
 # -> ...
+  my $failmsg = '';
 
   # Wrap all the SQL in a transaction
   eval {
-    my $sth = $dbh->prepare("delete from default_records where group_id=?");
+    my $sth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
+    $sth->execute($groupid);
+    my ($domcnt) = $sth->fetchrow_array;
+    $failmsg = "Can't remove group ".groupName($dbh,$groupid);
+    die "$domcnt domains still in group\n" if $domcnt;
+
+    $sth = $dbh->prepare("delete from default_records where group_id=?");
+    $failmsg = "Failed to delete default records for ".groupName($dbh,$groupid);
     $sth->execute($groupid);
     $sth = $dbh->prepare("delete from groups where group_id=?");
+    $failmsg = "Failed to remove group ".groupName($dbh,$groupid);
     $sth->execute($groupid);
 
-die "epic group fail FTW!\n";
     # once we get here, we should have suceeded.
     $dbh->commit;
@@ -358 +370 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',$msg);
+    return ('FAIL',"$failmsg: $msg");
   } else {
     return ('OK','OK');
@@ -447 +459 @@
     $sql .= " records where domain_id=$id and type=$reverse_typemap{SOA}";
   }
-#print "getSOA DEBUG: $sql<br>\n";
   my $sth = $dbh->prepare($sql);
   $sth->execute;
@@ -649 +660 @@
   $sth->execute($id);
 
-  return ('FAIL',$sth->errstr) if $sth->err;
+  return ('FAIL',"Couldn't remove record: ".$sth->errstr) if $sth->err;
 
   return ('OK','OK');

trunk/dns.cgi

@@ -392 +392 @@
   if (!defined($webvar{del})) {
     $page->param(del_getconf => 1);
-    $page->param(groupname => groupName($dbh,$webvar{id}));
+#    $page->param(groupname => groupName($dbh,$webvar{id}));
 # print some neato things?
 
@@ -400 +400 @@
   } elsif ($webvar{del} eq 'ok') {
     my ($code,$msg) = delGroup($dbh, $webvar{id});
+push @debugbits, groupName($dbh, $webvar{id});
     if ($code ne 'OK') {
 # need to find failure mode
@@ -414 +415 @@
     changepage(page => "grpman");
   }
-
+  $page->param(delgroupname => groupName($dbh, $webvar{id}));
 }
 
@@ -539 +540 @@
     $rec->{sid} = $webvar{sid};
     $rec->{id} = $id;
+    $rec->{distance} = 'n/a' unless ($rec->{type} eq 'MX' || $rec->{type} eq 'SRV'); 
+    $rec->{weight} = 'n/a' unless ($rec->{type} eq 'SRV'); 
+    $rec->{port} = 'n/a' unless ($rec->{type} eq 'SRV');
     $row++;
   }
   $page->param(reclist => $foo2);
 }
+
 
 # fill in record type list on add/update/edit record template

trunk/templates/delgrp.tmpl

@@ -4 +4 @@
 
 <td align="center">
-<h3>Are you really sure you want to delete group <TMPL_VAR NAME=groupname>?</h3>
+<h3>Are you really sure you want to delete group <TMPL_VAR NAME=delgroupname>?</h3>
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=delgrp&del=cancel&id=<TMPL_VAR NAME=id>">cancel</a> &nbsp; | &nbsp; 
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=delgrp&del=ok&id=<TMPL_VAR NAME=id>">confirm</a>
@@ -11 +11 @@
 <TMPL_ELSE>
  <!-- <TMPL_IF del_failed>
-  <div class='errmsg'>Error deleting group <TMPL_VAR NAME=groupname>: <TMPL_VAR NAME=errmsg></div>
+  <div class='errmsg'>Error deleting group <TMPL_VAR NAME=delgroupname>: <TMPL_VAR NAME=errmsg></div>
  </TMPL_IF> -->
  <TMPL_INCLUDE NAME="grpman.tmpl">

trunk/templates/grpman.tmpl

@@ -6 +6 @@
 
  <TMPL_IF del_failed>
-  <div class='errmsg'>Error deleting group <TMPL_VAR NAME=groupname>: <TMPL_VAR NAME=errmsg></div>
+  <div class='errmsg'>Error deleting group <TMPL_VAR NAME=delgroupname>: <TMPL_VAR NAME=errmsg></div>
  </TMPL_IF>
 
@@ -39 +39 @@
 <TMPL_LOOP name=grouptable>
 <tr class="row<TMPL_VAR name=bg>">
-        <td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=grpman&id=<TMPL_VAR NAME=groupid>"><TMPL_VAR NAME=groupname></a></td>
+        <td><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=grpman&action=chgroup&group=<TMPL_VAR NAME=groupid>"><TMPL_VAR NAME=groupname></a></td>
         <td width="5%" nowrap><TMPL_VAR name=pgroup></td>
         <td width="5%" nowrap><TMPL_VAR name=nusers></td>