From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 31 Dec 2006 09:37:49 +0000 (+0000)
Subject: ebl  fix $Bweb::config_file
X-Git-Tag: Release-2.0.0~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=382cc125dba5fa30ae82ee9fbecfca7211504edf;p=bacula%2Fbacula

ebl  fix $Bweb::config_file
ebl  fix database error message


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3874 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 1b2d1deb5e..c178dc3a65 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -52,7 +52,6 @@ package Bweb::Gui;
 
 use HTML::Template;
 our $template_dir='/usr/share/bweb/tpl';
-our $config_file='/etc/bacula/bweb.conf';
 
 =head1 FUNCTION
 
@@ -234,7 +233,7 @@ sub load
 
     unless (open(FP, $self->{config_file}))
     {
-	return $self->error("$self->{config_file} : $!");
+	return $self->error("can't load config_file $self->{config_file} : $!");
     }
     my $f=''; my $tmpbuffer;
     while(read FP,$tmpbuffer,4096)
@@ -1019,6 +1018,8 @@ use base q/Bweb::Gui/;
 use DBI;
 use POSIX qw/strftime/;
 
+our $config_file='/etc/bacula/bweb.conf';
+
 our $cur_id=0;
 
 =head1 VARIABLE
@@ -1183,7 +1184,7 @@ sub connect_db
 				    $self->{info}->{user},
 				    $self->{info}->{password});
 
-	print "Can't connect to your database, see error log\n"
+	$self->error("Can't connect to your database:\n$DBI::errstr\n")
 	    unless ($self->{dbh});
 
 	$self->{dbh}->{FetchHashKeyName} = 'NAME_lc';