Changeset 13180 for trunk/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

May 2, 2007, 5:21:28 PM (19 years ago)

Author:

jhoblitt

Message:

overhaul Nebulous::Client->cull()
add the number of instances to ->stat_object()

File:

• trunk/Nebulous-Server/lib/Nebulous/Server.pm (modified) (2 diffs)

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.32 2007-05-03 01:44:23 jhoblitt Exp $
+# $Id: Server.pm,v 1.33 2007-05-03 03:21:28 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -1021 +1021 @@
     my ( $key ) = validate_pos( @_,
         {
-            type => SCALAR,
-        },
-    );
-
-    my $log = $self->log;
-    my $sql = $self->sql;
-    my $db  =$self->db;
-
-    $log->debug( "entered - @_" );
+            type        => SCALAR,
+            callbacks   => {
+                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
+            },
+        },
+    );
+
+    my $log = $self->log;
+    my $sql = $self->sql;
+    my $db  =$self->db;
+
+    $log->debug("entered - @_");
 
     my $stat;
     eval {
-        my $query = $db->prepare_cached( $sql->get_object );
-        my $rows = $query->execute( $key );
-
-        unless ( $rows == 1 ) {
-            $log->logdie( "no storage object found" );
+        my $query = $db->prepare_cached( $sql->stat_object );
+        my $rows = $query->execute($key);
+
+        unless ($rows == 1) {
+            $log->logdie("no storage object found");
         }
 
         $stat = $query->fetchrow_arrayref;
         $query->finish;
-
-        $db->commit;
     };
     if ( $@ ) {
         $db->rollback;
-        $log->logdie( "database error: $@" );
-    }
-
-    $log->debug( "leaving" );
+        $log->logdie("database error: $@");
+    }
+
+    $log->debug("leaving");
 
     return $stat;