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

Timestamp:

Apr 1, 2009, 2:09:20 PM (17 years ago)

Author:

jhoblitt

Message:

base the on disk directory hashing of files only on the dirname() component of keys

File:

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

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

@@ -15 +15 @@
 use DBI;
 use Digest::SHA1 qw( sha1_hex );
+use File::Basename qw( dirname );
 use File::ExtAttr qw( setfattr );
 use File::Path;
 use File::Spec;
 use Log::Log4perl;
+use Nebulous::Keys qw( parse_neb_key parse_neb_volume );
 use Nebulous::Server::Config;
 use Nebulous::Server::Log;
 use Nebulous::Server::SQL;
-use Nebulous::Keys qw( parse_neb_key parse_neb_volume );
 use Params::Validate qw( validate_pos SCALAR SCALARREF UNDEF );
 use URI::file;
@@ -1579 +1580 @@
     my ($key, $vol_path) = @_;
 
+    # if the key has '/' in it, hash only the dirname() component
+    if ($key =~ m|/|) {
+        $key = dirname($key);
+    }
+
     # taken and modified from Cache::File::cache_file_path()
     # Copyright (C) 2003-2006 Chris Leishman.  All Rights Reserved.