Changeset 25027 for branches/pap/Nebulous-Server/lib/Nebulous/Server/Config.pm

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Nebulous-Server (modified) (1 prop)
• Nebulous-Server/lib/Nebulous/Server/Config.pm (modified) (4 diffs)

branches/pap/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 UNDEF );
 
 our %LEVELS = (
@@ -32 +32 @@
     dsn         => { type => SCALAR },
     dbuser      => { type => SCALAR },
-    dbpasswd    => { type => SCALAR },
+    dbpasswd    => { type => SCALAR | UNDEF },
 };
 
@@ -46 +46 @@
         },
     },
-    dsn         => { type => SCALAR, optional => 1 },
-    dbuser      => { type => SCALAR, optional => 1 },
-    dbpasswd    => { type => SCALAR, optional => 1 },
+    dsn                 => { type => SCALAR, optional => 1 },
+    dbuser              => { type => SCALAR, optional => 1 },
+    dbpasswd            => { type => SCALAR | UNDEF, optional => 1 },
+    memcached_servers   => { type => ARRAYREF, optional => 1 },
 };
 
@@ -61 +62 @@
 
     # normalize log levels to lower-case
-    my $self = { trace => $LEVELS{lc($p{trace})} };
+    my $self = {
+        trace             => $LEVELS{lc($p{trace})},
+        memcached_servers => $p{memcached_servers},
+    };
 
     bless $self, $class || ref $class;