Changeset 20990 for trunk/Nebulous-Server/lib/Nebulous/Server/Config.pm

Timestamp:

Dec 14, 2008, 12:54:25 PM (18 years ago)

Author:

eugene

Message:

reverting to pre-distributed version code (distrib is on branch)

File:

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

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

@@ -1 +1 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.4 2008-12-12 21:13:41 jhoblitt Exp $
+# $Id: Config.pm,v 1.5 2008-12-14 22:54:25 eugene Exp $
 
 package Nebulous::Server::Config;
@@ -8 +8 @@
 use warnings FATAL => qw( all );
 
-our $VERSION = 0.03;
+our $VERSION = 0.02;
 
 use base qw( Class::Accessor::Fast );
 
 use Log::Log4perl qw( :levels );
-use Params::Validate qw( validate validate_pos SCALAR );
+use Params::Validate qw( validate SCALAR );
 
 our %LEVELS = (
@@ -25 +25 @@
 );
 
-my $db_validate = {
-    dbindex       => {
-        type => SCALAR,
-        regex => qr/^\d+$/,
-    },
+my $new_validate = {
     dsn         => { type => SCALAR },
     dbuser      => { type => SCALAR },
     dbpasswd    => { type => SCALAR },
-};
-
-my $new_validate = {
     log_level   => {
         type        => SCALAR,
@@ -46 +39 @@
         },
     },
-    dsn         => { type => SCALAR, optional => 1 },
-    dbuser      => { type => SCALAR, optional => 1 },
-    dbpasswd    => { type => SCALAR, optional => 1 },
 };
 
 __PACKAGE__->mk_ro_accessors( keys %$new_validate );
 
-
-sub new
-{
+sub init {
     my $class = shift;
 
@@ -61 +49 @@
 
     # normalize log levels to lower-case
-    my $self ={ log_level => lc $p{ log_level } };
+    $p{ log_level } = lc $p{ log_level };
+
+    my $self = \%p;
 
     bless $self, $class || ref $class;
-
-    my @dbs;
-    $self->{dbs} = \@dbs;
-
-    if (defined $p{dsn} or defined $p{dbuser} or defined $p{dbpasswd}) {
-        $self->add_db(
-            dbindex     => 0,
-            dsn         => $p{dsn},
-            dbuser      => $p{dbuser},
-            dbpasswd    => $p{dbpasswd},
-        );
-    }
 
     return $self;
 }
 
-
-sub add_db
-{
-    my $self = shift;
-    
-    my %p = validate( @_, $db_validate );
-
-    my $config_db = Nebulous::Server::Config::DB->new({
-        dsn         => $p{dsn},
-        dbuser      => $p{dbuser},
-        dbpasswd    => $p{dbpasswd},
-    });
-
-    $self->{dbs}->[$p{dbindex}] = $config_db;
-
-    return $self;
-}
-
-
-sub db 
-{
-    my $self = shift;
-
-    my ($db_index) = validate_pos( @_, { type => SCALAR, optional => 1, });
-
-    # default to 0
-    $db_index ||= 0;
-
-    return $self->{dbs}->[$db_index];
-}
-
-
-sub n_db 
-{
-    my $self = shift;
-
-    return scalar @{ $self->{dbs} };
-}
-
-
-package Nebulous::Server::Config::DB;
-
-use strict;
-use warnings FATAL => qw( all );
-
-our $VERSION = 0.01;
-
-use base qw( Class::Accessor::Fast );
-
-__PACKAGE__->mk_ro_accessors(qw( dsn dbuser dbpasswd )); 
-
 1;