Changeset 63

Timestamp:

11/12/04 11:52:03 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up some error handling code relating to DB transactions

File:

• trunk/cgi-bin/main.cgi (modified) (4 diffs)

trunk/cgi-bin/main.cgi

@@ -118 +118 @@
     $sth = $ip_dbh->prepare("insert into masterblocks values ('$webvar{cidr}')");
     $sth->execute;
-# Don't need this with RaiseError, but leave it for now.
-#    croak $sth->errstr if ($sth->errstr());
 
 # Unrouted blocks aren't associated with a city (yet).  We don't rely on this
@@ -128 +126 @@
         $cidr->masklen.",'<NULL>','n')");
     $sth->execute;
-# Don't need this with RaiseError, but leave it for now.
-#    croak $sth->errstr if ($sth->errstr());
 
     # If we get here, everything is happy.  Commit changes.
@@ -998 +994 @@
 # Allow transactions, and make errors much easier to catch.
 # Much as I would like to error-track specifically on each ->execute,
-# that's a LOT of code.  :/
-    $ip_dbh->{AutoCommit} = 0;
-    $ip_dbh->{RaiseError} = 1;
+# that's a LOT of code, and some SQL blocks MUST be atomic at a
+# multi-statement level.  :/
+    local $ip_dbh->{AutoCommit} = 0;    # These need to be local so we don't
+    local $ip_dbh->{RaiseError} = 1;    # step on our toes by accident.
 
     if ($webvar{fullcidr} eq $webvar{alloc_from}) {
@@ -1133 +1130 @@
     syslog "notice", "$full_alloc_types{$webvar{alloctype}} '$webvar{fullcidr}' successfully initialized by $authuser";
 
-    # Turn off transactions and exception-on-error'ing
-    $ip_dbh->{AutoCommit} = 0;
-    $ip_dbh->{RaiseError} = 1;
-
     print qq(<div class="center"><div class="heading">The block $webvar{fullcidr} was sucessfully added as type '$webvar{alloctype}' ($full_alloc_types{$webvar{alloctype}})</div></div>);