Index: trunk/Nebulous-Server/lib/Nebulous/Server.pm
===================================================================
--- trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 24362)
+++ trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 24363)
@@ -427,5 +427,5 @@
                     $query->finish;
                 }
-                $log->logdie("failed to get LAST_INSERT_ID()")
+                die("failed to get LAST_INSERT_ID()")
                     unless $parent_id;
 
@@ -504,5 +504,5 @@
             unless ($rows == 1) {
                 $query->finish;
-                $log->logdie("affected row count is $rows instead of 1");
+                die("affected row count is $rows instead of 1");
             }
 
@@ -591,5 +591,5 @@
               unless ($rows == 1) {
                   $query->finish;
-                  $log->logdie("affected row count is $rows instead of 1");
+                  die("affected row count is $rows instead of 1");
               }
           }
@@ -604,5 +604,5 @@
               unless ($rows == 1) {
                   $query->finish;
-                  $log->logdie("affected row count is $rows instead of 1");
+                  die("affected row count is $rows instead of 1");
               }
           }
@@ -617,5 +617,5 @@
               unless ($rows == 1) {
                   $query->finish;
-                  $log->logdie("affected row count is $rows instead of 1");
+                  die("affected row count is $rows instead of 1");
               }
           }
@@ -733,5 +733,5 @@
                 unless ( $rows > 0 ) {
                     $query->finish;
-                    $log->logdie( "storage object does not exist" );
+                    die( "storage object does not exist" );
                 }
 
@@ -854,5 +854,5 @@
                 unless ( $rows == 1 ) {
                     $query->finish;
-                    $log->logdie( "storage object does not exist" );
+                    die( "storage object does not exist" );
                 }
 
@@ -869,9 +869,9 @@
                 # can't set a write lock if there are read locks
                 if ($write_lock) {
-                    $log->logdie("can not write lock twice -- retry");
+                    die("can not write lock twice -- retry");
                 }
                 
                 if ($read_lock > 0) {
-                    $log->logdie("can not write lock after read lock -- retry");
+                    die("can not write lock after read lock -- retry");
                 }
 
@@ -882,5 +882,5 @@
                     # if we affected more then one row something very bad has happened.
                     unless ($rows == 1) {
-                        $log->logdie("affected row count is $rows instead of 1");
+                        die("affected row count is $rows instead of 1");
                     }
 
@@ -889,5 +889,5 @@
                 # can't set a read lock if there's a write lock
                 if ($write_lock) {
-                    $log->logdie("can not read lock after write lock -- retry");
+                    die("can not read lock after write lock -- retry");
                 }
 
@@ -898,5 +898,5 @@
                     # if we affected more then one row something very bad has happened.
                     unless ($rows == 1) {
-                        $log->logdie("affected row count is $rows instead of 1");
+                        die("affected row count is $rows instead of 1");
                     }
                 }
@@ -968,5 +968,5 @@
                 unless ($rows == 1) {
                     $query->finish;
-                    $log->logdie("storage object does not exist");
+                    die("storage object does not exist");
                 }
 
@@ -982,9 +982,9 @@
                 # can't remove a write lock if it doesn't exist
                 if ($read_lock) {
-                    $log->logdie("can not have a write lock under a read lock");
+                    die("can not have a write lock under a read lock");
                 }
 
                 unless ($write_lock) {
-                    $log->logdie("can not remove non-existant write lock");
+                    die("can not remove non-existant write lock");
                 }
 
@@ -995,5 +995,5 @@
                     # if we affected more then one row something very bad has happened.
                     unless ($rows == 1) {
-                        $log->logdie("affected row count is $rows instead of 1");
+                        die("affected row count is $rows instead of 1");
                     }
                 }
@@ -1002,9 +1002,9 @@
                 # can't remove a read lock if there aren't any
                 if ($write_lock) {
-                    $log->logdie("can not have a read lock under a write lock");
+                    die("can not have a read lock under a write lock");
                 }
                    
                 if ($read_lock == 0) {
-                    $log->logdie("can not remove non-existant read lock");
+                    die("can not remove non-existant read lock");
                 }
 
@@ -1015,5 +1015,5 @@
                     # if we affected more then one row something very bad has happened.
                     unless ($rows == 1) {
-                        $log->logdie("affected row count is $rows instead of 1");
+                        die("affected row count is $rows instead of 1");
                     }
 
@@ -1101,5 +1101,5 @@
             if ($flags eq 'create') {
                 unless ($rows == 1) {
-                    $log->logdie( "affected row count is $rows instead of 1" );
+                    die( "affected row count is $rows instead of 1" );
                 }
             } else {
@@ -1107,5 +1107,5 @@
                 # the case of a replace and 1 if the xattr didn't already exist.
                 unless ($rows == 1 or $rows == 2) {
-                    $log->logdie( "affected row count is $rows instead of 2" );
+                    die( "affected row count is $rows instead of 2" );
                 }
             }
@@ -1174,10 +1174,10 @@
         if ($rows == 0) {
             $query->finish;
-            $log->logdie( "xattr $key:$name does not exist" );
+            die( "xattr $key:$name does not exist" );
         }
         # if we go more then one row bad something very bad has happened.
         unless ($rows == 1) {
             $query->finish;
-            $log->logdie( "affected row count is $rows instead of 1" );
+            die( "affected row count is $rows instead of 1" );
         }
 
@@ -1282,10 +1282,10 @@
             # no rows affected means the xattr did not exist
             if ($rows == 0) {
-                $log->logdie( "xattr $key:$name does not exist" );
+                die( "xattr $key:$name does not exist" );
             }
 
             # if we affected more then one row something very bad has happened.
             if ($rows > 1) {
-                $log->logdie( "affected row count is $rows instead of 1" );
+                die( "affected row count is $rows instead of 1" );
             }
 
@@ -1481,5 +1481,5 @@
             unless ($rows > 0) {
                 $query->finish;
-                $log->logdie("no instances on storage volume or volume is not avaiable for key: $key volume: $vol_name");
+                die("no instances on storage volume or volume is not avaiable for key: $key volume: $vol_name");
             }
         } else {
@@ -1489,5 +1489,5 @@
             unless ($rows > 0) {
                 $query->finish;
-                $log->logdie("no instances available for key: $key");
+                die("no instances available for key: $key");
             }
         }
@@ -1559,5 +1559,5 @@
                 unless ( $rows > 0 ) {
                     $query->finish;
-                    $log->logdie( "no instance is associated with uri" );
+                    die( "no instance is associated with uri" );
                 }
 
@@ -1584,5 +1584,5 @@
                 # has happened
                 unless ( $rows == 1 ) {
-                    $log->logdie( "affected row count is $rows instead of 1" );
+                    die( "affected row count is $rows instead of 1" );
                 }
             }
@@ -1601,5 +1601,5 @@
                 # TODO: this will have to be changed in order to support hardlinks
                 unless ( $rows == 1 ) {
-                    $log->logdie( "affected row count is $rows instead of 2" );
+                    die( "affected row count is $rows instead of 2" );
                 }
             }
@@ -1658,5 +1658,5 @@
 
         unless ($rows == 1) {
-            $log->logdie("no storage object found");
+            die("no storage object found");
         }
 
@@ -1817,10 +1817,10 @@
                     return; # this just returns out of the eval not from the subroutine
                 }
-                $log->logdie("storage volume: $name is not available");
+                die("storage volume: $name is not available");
             }
             # when matching by name we shouldn't ever match more than once
             if ($rows > 1) {
                 $query->finish;
-                $log->logdie("affected row count is $rows instead of 1");
+                die("affected row count is $rows instead of 1");
             }
         } else {
@@ -1831,5 +1831,5 @@
             unless ($rows > 0) {
                 $query->finish;
-                $log->logdie("no storage volume is available for key: $key volume: $name hard_volume: $hard_volume");
+                die("no storage volume is available for key: $key volume: $name hard_volume: $hard_volume");
             }
         }
@@ -1873,10 +1873,10 @@
         unless ($rows > 0) {
             $query->finish;
-            $log->logdie("can't find a suitable storage volume to replicate $key to");
+            die("can't find a suitable storage volume to replicate $key to");
         }
         # when matching by name we shouldn't ever match more than once
         if ($rows > 1) {
             $query->finish;
-            $log->logdie("affected row count is $rows instead of 1");
+            die("affected row count is $rows instead of 1");
         }
 
@@ -2022,5 +2022,5 @@
         unless (-d $storage_path) {
             $self->_retry(sub { mkpath([$storage_path], 0, 0775) })
-                or $log->logdie("can't create storage path: $storage_path");
+                or die("can't create storage path: $storage_path");
         }
         # check to make sure at least the parent directory has the proper
@@ -2030,5 +2030,5 @@
             $log->error("$storage_path has the wrong permissions of: 0", sprintf("%o", $mode));
             $self->_retry(sub { chmod(0775, $storage_path) })
-                or $log->logdie("can not chmod() $storage_path: $!");
+                or die("can not chmod() $storage_path: $!");
         }