Changeset 17690

Timestamp:

May 14, 2008, 4:50:03 PM (18 years ago)

Author:

jhoblitt

Message:

cleanup error handling in Nebulous::Server::stat_object()/find_objects()

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Server.pm (modified) (6 diffs)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.10
+    - cleanup error handling in Nebulous::Server::stat_object()/find_objects()
     - update Nebulous::Server::lock_object()/unlock_object() fault strings
     - cleanup database error handling: make sure queries are ->finished before

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.69 2008-05-15 00:36:41 jhoblitt Exp $
+# $Id: Server.pm,v 1.70 2008-05-15 02:50:03 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -860 +860 @@
     unless ($pattern) {
         $log->debug( "leaving" );
-        return [];
+        $log->logdie("no keys found");
     }
 
@@ -880 +880 @@
     $log->logdie("database error: $@") if $@;
 
-    $log->debug( "no keys found" ) unless ( scalar @keys );
+    $log->logdie("no keys found") unless ( scalar @keys );
 
     $log->debug( "leaving" );
@@ -1058 +1058 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
         },
     );
@@ -1066 +1069 @@
 
     $log->debug("entered - @_");
-
-    # does this key exist?
-    return unless ($self->_is_valid_object_key($key));
 
     # ignore volume
@@ -1079 +1079 @@
 
         unless ($rows == 1) {
-            $log->debug("no storage object found");
+            $log->logdie("no storage object found");
         }