Changeset 23 for trunk/DNSDB.pm

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

File:

• trunk/DNSDB.pm (modified) (6 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');