Wallet::Server is now responsible for connecting to the database. Don't

bother working hard to disconnect the database on exit, since the DESTROY
DBI method will do the right thing.

1 files changed, 1 insertions, 20 deletions

diff --git a/server/wallet-backend b/server/wallet-backend
index 24910cd..e8617cd 100755
--- a/server/wallet-backend
+++ b/server/wallet-backend
@@ -20,21 +20,6 @@ use Wallet::Config;
 use Wallet::Server;
 
 ##############################################################################
-# Database handling
-##############################################################################
-
-# Open a new database connection.  This is a separate function to make it
-# easier to override later.
-sub db_connect {
-    my $dsn = "DBI:$DB_DRIVER:database=$DB_NAME;host=$DB_HOST;port=$DB_PORT";
-    my $dbh = DBI->connect ($dsn, $DB_USER, $DB_PASSWORD);
-    if (not defined $dbh) {
-        die "Cannot connect to database: $DBI::errstr\n";
-    }
-    return $dbh;
-}
-
-##############################################################################
 # Implementation
 ##############################################################################
 
@@ -47,12 +32,8 @@ my $user = $ENV{REMOTE_USER} or die "REMOTE_USER not set\n";
 my $host = $ENV{REMOTE_HOST} || $ENV{REMOTE_ADDR}
     or die "Neither REMOTE_HOST nor REMOTE_USER set\n";
 
-# Open the database connection and close it cleanly on exit.
-my $dbh = db_connect;
-END { $dbh->disconnect; }
-
 # Instantiate the server object.
-my $server = Wallet::Server->new ($dbh, $user, $host);
+my $server = Wallet::Server->new ($user, $host);
 
 # Parse command-line options and dispatch to the appropriate calls.
 my ($command, @args) = @ARGV;