Changeset 24369

Timestamp:

Jun 10, 2009, 1:35:23 PM (17 years ago)

Author:

jhoblitt

Message:

drop Cache::Memcached::Managed for Cache::Memcached

Location:

trunk/Nebulous-Server/lib/Nebulous

Files:

• Server.pm (modified) (4 diffs)
• Server/Config.pm (modified) (2 diffs)

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

@@ -13 +13 @@
 use base qw( Class::Accessor::Fast );
 
-use Cache::Memcached::Managed;
+use Cache::Memcached;
 use DBI;
 use Digest::SHA1 qw( sha1_hex );
@@ -66 +66 @@
     $self->sql($sql);
     $self->config($config);
-    my $memcached_server = $config->memcached;
-    if (defined $memcached_server) {
-        $self->cache(Cache::Memcached::Managed->new(
-            data        => $memcached_server,
-            expiration  => 0,
-        ));
-    }
+    $self->cache(
+        Cache::Memcached->new({
+            servers => $config->memcached_servers,
+       })
+    );
+#    $self->cache->set("foo", "bar") or die "set failed";
+#    $self->cache->get("foo") or die "get failed";
     $log->logdie("at least one database must be defined") unless $config->n_db;
 
@@ -330 +330 @@
 
     # add new key to the cache
-    $self->cache->set(id => $key->path, value => 1) if defined $self->cache;
+    $self->cache->set($key->path, 1) if defined $self->cache;
     $log->debug( "key added to cache" );
 
@@ -1955 +1955 @@
         $log->debug( "key found in db" );
         # add key to cache
-        $self->cache->set(id => $key->path, value => 1) if defined $self->cache;
+        $self->cache->set($key->path, 1) if defined $self->cache;
         $log->debug( "key added to cache" );
         $log->debug( "leaving" );

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

@@ -13 +13 @@
 
 use Log::Log4perl qw( :levels );
-use Params::Validate qw( validate validate_pos SCALAR );
+use Params::Validate qw( validate validate_pos SCALAR ARRAYREF );
 
 our %LEVELS = (
@@ -46 +46 @@
         },
     },
-    dsn         => { type => SCALAR, optional => 1 },
-    dbuser      => { type => SCALAR, optional => 1 },
-    dbpasswd    => { type => SCALAR, optional => 1 },
-    memcached   => { type => SCALAR, default => '127.0.0.1:11311' },
+    dsn                 => { type => SCALAR, optional => 1 },
+    dbuser              => { type => SCALAR, optional => 1 },
+    dbpasswd            => { type => SCALAR, optional => 1 },
+    memcached_servers   => { type => ARRAYREF, optional => 1 },
 };