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

Timestamp:

Jun 30, 2008, 2:28:07 PM (18 years ago)

Author:

jhoblitt

Message:

add volume.host field

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.77 2008-06-09 20:34:30 jhoblitt Exp $
+# $Id: Server.pm,v 1.78 2008-07-01 00:28:06 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -178 +178 @@
     }
         
-    my ($vol_id, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
+    my ($vol_id, $vol_host, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
 
     my $uri;
@@ -353 +353 @@
     }
         
-    my ($vol_id, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
+    my ($vol_id, $vol_host, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
 
     my $uri;
@@ -1152 +1152 @@
     my $name = shift;
 
-    my ($vol_id, $vol_path, $xattr);
+    my ($vol_id, $vol_host, $vol_path, $xattr);
     eval {
         # TODO cache this?
@@ -1183 +1183 @@
 
         my $free;
-        ($vol_id, $vol_path, $xattr, $free) = $query->fetchrow_array;
+        ($vol_id, $vol_host, $vol_path, $xattr, $free) = $query->fetchrow_array;
         $query->finish;
     };
@@ -1193 +1193 @@
     $log->debug( "leaving" );
 
-    return ($vol_id, $vol_path, $xattr);
+    return ($vol_id, $vol_host, $vol_path, $xattr);
 }