Changeset 24355

Timestamp:

Jun 8, 2009, 11:46:09 AM (17 years ago)

Author:

jhoblitt

Message:

make sure that atleast one db is always defined

Location:

trunk/Nebulous-Server

Files:

• lib/Nebulous/Server.pm (modified) (3 diffs)
• t/02_server_setup.t (modified) (2 diffs)

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

@@ -13 +13 @@
 use base qw( Class::Accessor::Fast );
 
+use Cache::Memcached::Managed;
 use DBI;
 use Digest::SHA1 qw( sha1_hex );
@@ -27 +28 @@
 use Params::Validate qw( validate validate_pos SCALAR SCALARREF UNDEF BOOLEAN );
 use URI::file;
-use Cache::Memcached::Managed;
 
 __PACKAGE__->mk_accessors(qw( log sql config cache ));
@@ -64 +64 @@
     $self->config($config);
     $self->cache(Cache::Memcached::Managed->new($config->memcached));
+    $log->logdie("at least one database must be defined") unless $config->n_db;
+
     # cause a db session to be started
     $self->_db_for_index(0);

trunk/Nebulous-Server/t/02_server_setup.t

@@ -17 +17 @@
 Test::Nebulous->setup;
 
-isa_ok(Nebulous::Server->new(), "Nebulous::Server");
-
-Test::Nebulous->setup;
-
 # ->new()
-{
-    my $neb = Nebulous::Server->new( trace => 'off' );
-
-    ok($neb, "set log level");
-}
-
-Test::Nebulous->setup;
 
 {
     my $neb = Nebulous::Server->new(
-        dsn         => "DBI:mysql:database=foobar:host=localhost",
-        dbuser      => "baz",
-        dbpasswd    =>"boo",
+        dsn         => $NEB_DB,
+        dbuser      => $NEB_USER,
+        dbpasswd    => $NEB_PASS,
     );
 
@@ -42 +31 @@
 Test::Nebulous->setup;
 
+{
+    my $neb = Nebulous::Server->new(
+        dsn         => $NEB_DB,
+        dbuser      => $NEB_USER,
+        dbpasswd    => $NEB_PASS,
+        trace       => 'off',
+    );
+
+    ok($neb, "set log level");
+}
+
+Test::Nebulous->setup;
+
 # add dbs after ->new()
 {
-    my $neb = Nebulous::Server->new;
+    my $config = Nebulous::Server::Config->new;
 
-    ok($neb->config->add_db(
+    ok($config->add_db(
         dbindex    => 0,
-        dsn         => "DBI:mysql:database=foobar:host=localhost",
-        dbuser      => "baz",
-        dbpasswd    =>"boo",
+        dsn         => $NEB_DB,
+        dbuser      => $NEB_USER,
+        dbpasswd    => $NEB_PASS,
     ), "add db");
     
-    ok($neb->config->add_db(
+    ok($config->add_db(
         dbindex    => 1,
-        dsn         => "DBI:mysql:database=foobar:host=localhost",
-        dbuser      => "baz",
-        dbpasswd    =>"boo",
+        dsn         => $NEB_DB,
+        dbuser      => $NEB_USER,
+        dbpasswd    => $NEB_PASS,
     ), "add dbs");
 
-    is($neb->config->n_db, 2, "n dbs")
+    is($config->n_db, 2, "n dbs");
+
+    my $neb = Nebulous::Server->new_from_config($config);
+     
+    isa_ok($neb, 'Nebulous::Server');
 }