oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stop using readAllConfigs in testEnvironment.pl

Browse source
This commit is contained in:
Graham Knop 2011-07-05 08:35:48 -05:00
parent c4af0e33df
commit 106d888e97
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sbin/testEnvironment.pl
View file

@ -204,22 +204,26 @@ if ($version eq $WebGUI::VERSION."-".$WebGUI::STATUS) {
printResult("You are using ".$WebGUI::VERSION."-".$WebGUI::STATUS." and ".$version." is available."); printResult("You are using ".$WebGUI::VERSION."-".$WebGUI::STATUS." and ".$version." is available.");
} }
require WebGUI::Paths;
require File::Spec;
printTest("Locating WebGUI configs"); printTest("Locating WebGUI configs");
my $configs = WebGUI::Config->readAllConfigs($webguiRoot); my @configs = WebGUI::Paths->siteConfigs;
printResult("OK"); printResult("OK");
foreach my $filename (keys %{$configs}) { foreach my $filename (@configs) {
my $shortName = (File::Spec->splitpath($filename))[2];
print "\n"; print "\n";
################################### ###################################
# Checking Config File # Checking Config File
################################### ###################################
printTest("Checking config file"); printTest("Checking config file");
printResult($filename); printResult($shortName);
my $config = WebGUI::Config->new($filename);
################################### ###################################
# Checking uploads folder # Checking uploads folder
################################### ###################################
printTest("Verifying uploads folder"); printTest("Verifying uploads folder");
if (opendir(DIR,$configs->{$filename}->get("uploadsPath"))) { if (opendir(DIR,$config->get("uploadsPath"))) {
printResult("OK"); printResult("OK");
closedir(DIR); closedir(DIR);
} else { } else {
@ -227,7 +231,7 @@ foreach my $filename (keys %{$configs}) {
} }
printTest("Verifying DSN"); printTest("Verifying DSN");
my $dsnok = 0; my $dsnok = 0;
if ($configs->{$filename}->get("dsn") !~ /\DBI\:\w+\:\w+/) { if ($config->get("dsn") !~ /\DBI\:\w+\:\w+/) {
printResult("DSN is improperly formatted."); printResult("DSN is improperly formatted.");
} else { } else {
printResult("OK"); printResult("OK");
@ -240,7 +244,7 @@ foreach my $filename (keys %{$configs}) {
if ($dsnok) { if ($dsnok) {
printTest("Verifying database connection"); printTest("Verifying database connection");
my ($dbh, $test); my ($dbh, $test);
unless (eval {$dbh = DBI->connect($configs->{$filename}->get("dsn"),$configs->{$filename}->get("dbuser"),$configs->{$filename}->get("dbpass"))}) { unless (eval {$dbh = DBI->connect($config->get("dsn"),$config->get("dbuser"),$config->get("dbpass"))}) {
printResult("Can't connect with info provided!"); printResult("Can't connect with info provided!");
} else { } else {
printResult("OK"); printResult("OK");