[open-ils-commits] [GIT] Evergreen ILS branch master updated. 7842cea0c8304c2c86cb0f045e3563e667064285
Evergreen Git
git at git.evergreen-ils.org
Thu Oct 13 22:25:57 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 7842cea0c8304c2c86cb0f045e3563e667064285 (commit)
via ada4a5ab37dbb7a5568b00e0096afbb26216e9f2 (commit)
via 6fdbecf11a7999d62a869f48e78aecf1f74aaf5e (commit)
via debb295184b26018a0087ac60f54f7eaf7b837de (commit)
from 425c29e1e3c80b8d1fc637bf557dc3801e3245e6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7842cea0c8304c2c86cb0f045e3563e667064285
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Oct 13 22:25:04 2011 -0400
Add MARC::Record 2.0.1 minimum test to settings-tester.pl
Wrap the use_ok() tests in a BEGIN block, per the recommendation of the
Test::More perldoc.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/support-scripts/settings-tester.pl b/Open-ILS/src/support-scripts/settings-tester.pl
index 31be6ae..d76c682 100755
--- a/Open-ILS/src/support-scripts/settings-tester.pl
+++ b/Open-ILS/src/support-scripts/settings-tester.pl
@@ -2,13 +2,16 @@
# vim:et:ts=4:
use strict;
use warnings;
-use Test::More tests => 4;
+use Test::More tests => 5;
use Error qw(:try);
-use_ok( 'OpenSRF::Utils::Config' );
-use_ok( 'UNIVERSAL::require' );
-use_ok( 'Getopt::Long' );
-use_ok( 'Net::Domain' );
+BEGIN {
+ use_ok( 'OpenSRF::Utils::Config' );
+ use_ok( 'UNIVERSAL::require' );
+ use_ok( 'Getopt::Long' );
+ use_ok( 'MARC::Record', '2.0.1' );
+ use_ok( 'Net::Domain' );
+}
my $output = '';
my $perloutput = '';
commit ada4a5ab37dbb7a5568b00e0096afbb26216e9f2
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Oct 13 22:15:53 2011 -0400
Settings-tester.pl whitespace
Might as well complete the conversion of the file into modernity.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/support-scripts/settings-tester.pl b/Open-ILS/src/support-scripts/settings-tester.pl
index 094010d..31be6ae 100755
--- a/Open-ILS/src/support-scripts/settings-tester.pl
+++ b/Open-ILS/src/support-scripts/settings-tester.pl
@@ -15,38 +15,38 @@ my $perloutput = '';
my $result;
my ($gather, $hostname, $core_config, $tmpdir) =
- (0, Net::Domain::hostfqdn(), '/openils/conf/opensrf_core.xml', '/tmp/');
+ (0, Net::Domain::hostfqdn(), '/openils/conf/opensrf_core.xml', '/tmp/');
GetOptions(
- 'gather' => \$gather,
- 'hostname=s' => \$hostname,
- 'config_file=s' => \$core_config,
- 'tempdir=s' => \$tmpdir,
+ 'gather' => \$gather,
+ 'hostname=s' => \$hostname,
+ 'config_file=s' => \$core_config,
+ 'tempdir=s' => \$tmpdir,
);
while (my $mod = <DATA>) {
- chomp $mod;
- my @list = split / /, $mod;
-
- my $ok = 0;
- for my $m (@list) {
- if ($m->use) {
- $ok++;
- my $version = $m->VERSION;
- print "$m version $version\n" if ($version);
- }
- }
-
- unless ($ok) {
- if (@list == 1) {
- warn "Please install $mod\n";
- $perloutput .= "Please install the $mod Perl module.\n";
- } else {
- warn "Please install one of the following modules: $mod\n";
- $perloutput .= "Please install one of the following modules: $mod\n";
- }
- }
-
+ chomp $mod;
+ my @list = split / /, $mod;
+
+ my $ok = 0;
+ for my $m (@list) {
+ if ($m->use) {
+ $ok++;
+ my $version = $m->VERSION;
+ print "$m version $version\n" if ($version);
+ }
+ }
+
+ unless ($ok) {
+ if (@list == 1) {
+ warn "Please install $mod\n";
+ $perloutput .= "Please install the $mod Perl module.\n";
+ } else {
+ warn "Please install one of the following modules: $mod\n";
+ $perloutput .= "Please install one of the following modules: $mod\n";
+ }
+ }
+
}
use OpenSRF::Transport::SlimJabber::Client;
@@ -81,7 +81,7 @@ $output .= check_libdbd();
check_hostname();
if ($gather) {
- get_debug_info( $tmpdir, $log_dir, $conf_dir, $perloutput, $output );
+ get_debug_info( $tmpdir, $log_dir, $conf_dir, $perloutput, $output );
}
sub check_all_database_connections {
@@ -135,51 +135,51 @@ sub check_all_database_connections {
sub test_db_connect {
- my ($db_name, $db_host, $db_port, $db_user, $db_pw, $osrf_xpath) = @_;
-
- my $dsn = "dbi:Pg:dbname=$db_name;host=$db_host;port=$db_port";
- my $de = undef;
- my ($dbh, $encoding, $langs);
- $dbh = DBI->connect($dsn, $db_user, $db_pw);
-
- # Short-circuit if we didn't connect successfully
- unless($dbh) {
- $de = "* $osrf_xpath :: Unable to connect to database $dsn, user=$db_user, password=$db_pw\n";
- warn "* $osrf_xpath :: Unable to connect to database $dsn, user=$db_user, password=$db_pw\n";
- return $de;
- }
-
- # Get server encoding
- my $sth = $dbh->prepare("SHOW server_encoding");
- $sth->execute;
- $sth->bind_col(1, \$encoding);
- $sth->fetch;
- $sth->finish;
-
- # Get list of server languages
- $sth = $dbh->prepare("SELECT lanname FROM pg_catalog.pg_language");
- $sth->execute;
- $langs = $sth->fetchall_arrayref([0]);
- $sth->finish;
-
- $dbh->disconnect;
- print "* $osrf_xpath :: Successfully connected to database $dsn\n" unless ($de);
-
- # Check encoding
- if ($encoding !~ m/(utf-?8|unicode)/i) {
- $de .= "* ERROR: $osrf_xpath :: Database $dsn has encoding $encoding instead of UTF8 or UNICODE.\n";
- warn "* ERROR: $osrf_xpath :: Database $dsn has encoding $encoding instead of UTF8 or UNICODE.\n";
- } else {
- print " * Database has the expected server encoding $encoding.\n";
- }
-
- my $result = check_db_langs($langs);
- if ($result) {
- $de .= $result;
- warn $result;
- }
-
- return ($de) ? $de : "* $osrf_xpath :: Successfully connected to database $dsn with encoding $encoding\n";
+ my ($db_name, $db_host, $db_port, $db_user, $db_pw, $osrf_xpath) = @_;
+
+ my $dsn = "dbi:Pg:dbname=$db_name;host=$db_host;port=$db_port";
+ my $de = undef;
+ my ($dbh, $encoding, $langs);
+ $dbh = DBI->connect($dsn, $db_user, $db_pw);
+
+ # Short-circuit if we didn't connect successfully
+ unless($dbh) {
+ $de = "* $osrf_xpath :: Unable to connect to database $dsn, user=$db_user, password=$db_pw\n";
+ warn "* $osrf_xpath :: Unable to connect to database $dsn, user=$db_user, password=$db_pw\n";
+ return $de;
+ }
+
+ # Get server encoding
+ my $sth = $dbh->prepare("SHOW server_encoding");
+ $sth->execute;
+ $sth->bind_col(1, \$encoding);
+ $sth->fetch;
+ $sth->finish;
+
+ # Get list of server languages
+ $sth = $dbh->prepare("SELECT lanname FROM pg_catalog.pg_language");
+ $sth->execute;
+ $langs = $sth->fetchall_arrayref([0]);
+ $sth->finish;
+
+ $dbh->disconnect;
+ print "* $osrf_xpath :: Successfully connected to database $dsn\n" unless ($de);
+
+ # Check encoding
+ if ($encoding !~ m/(utf-?8|unicode)/i) {
+ $de .= "* ERROR: $osrf_xpath :: Database $dsn has encoding $encoding instead of UTF8 or UNICODE.\n";
+ warn "* ERROR: $osrf_xpath :: Database $dsn has encoding $encoding instead of UTF8 or UNICODE.\n";
+ } else {
+ print " * Database has the expected server encoding $encoding.\n";
+ }
+
+ my $result = check_db_langs($langs);
+ if ($result) {
+ $de .= $result;
+ warn $result;
+ }
+
+ return ($de) ? $de : "* $osrf_xpath :: Successfully connected to database $dsn with encoding $encoding\n";
}
@@ -309,120 +309,120 @@ sub check_all_jabber {
}
sub check_jabber {
- my ($j_username, $j_password, $j_domain, $j_port) = @_;
- print "\nChecking Jabber connection for user $j_username, domain $j_domain\n";
-
- # connect to jabber
- my $client = OpenSRF::Transport::SlimJabber::Client->new(
- port => $j_port,
- username => $j_username,
- password => $j_password,
- host => $j_domain,
- resource => 'test123'
- );
-
-
- my $je = undef;
- try {
- unless($client->initialize()) {
- $je = "* Unable to connect to jabber server $j_domain\n";
- warn "* Unable to connect to jabber server $j_domain\n";
- }
- } catch Error with {
- $je = "* Error connecting to jabber:\n" . shift() . "\n";
- warn "* Error connecting to jabber:\n" . shift() . "\n";
- };
-
- print "* Jabber successfully connected\n" unless ($je);
- $output .= ($je) ? $je : "* Jabber successfully connected\n";
+ my ($j_username, $j_password, $j_domain, $j_port) = @_;
+ print "\nChecking Jabber connection for user $j_username, domain $j_domain\n";
+
+ # connect to jabber
+ my $client = OpenSRF::Transport::SlimJabber::Client->new(
+ port => $j_port,
+ username => $j_username,
+ password => $j_password,
+ host => $j_domain,
+ resource => 'test123'
+ );
+
+
+ my $je = undef;
+ try {
+ unless($client->initialize()) {
+ $je = "* Unable to connect to jabber server $j_domain\n";
+ warn "* Unable to connect to jabber server $j_domain\n";
+ }
+ } catch Error with {
+ $je = "* Error connecting to jabber:\n" . shift() . "\n";
+ warn "* Error connecting to jabber:\n" . shift() . "\n";
+ };
+
+ print "* Jabber successfully connected\n" unless ($je);
+ $output .= ($je) ? $je : "* Jabber successfully connected\n";
}
sub check_hostname {
- print "\nChecking hostname\n";
- my @hosts = $osrfxml->findnodes('/opensrf/hosts/*');
- foreach my $host (@hosts) {
- next unless $host->nodeType == XML::LibXML::XML_ELEMENT_NODE;
- my $osrfhost = $host->nodeName;
- my $he;
- if ($osrfhost ne $hostname && $osrfhost ne "localhost") {
- $result = " * ERROR: expected hostname '$hostname', found '$osrfhost' in <hosts> section of opensrf.xml\n";
- warn $result;
- $he = 1;
- } elsif ($osrfhost eq "localhost") {
- $result = " * OK: found hostname 'localhost' in <hosts> section of opensrf.xml\n";
- } else {
- $result = " * OK: found hostname '$hostname' in <hosts> section of opensrf.xml\n";
- }
- print $result unless $he;
- $output .= $result;
- }
+ print "\nChecking hostname\n";
+ my @hosts = $osrfxml->findnodes('/opensrf/hosts/*');
+ foreach my $host (@hosts) {
+ next unless $host->nodeType == XML::LibXML::XML_ELEMENT_NODE;
+ my $osrfhost = $host->nodeName;
+ my $he;
+ if ($osrfhost ne $hostname && $osrfhost ne "localhost") {
+ $result = " * ERROR: expected hostname '$hostname', found '$osrfhost' in <hosts> section of opensrf.xml\n";
+ warn $result;
+ $he = 1;
+ } elsif ($osrfhost eq "localhost") {
+ $result = " * OK: found hostname 'localhost' in <hosts> section of opensrf.xml\n";
+ } else {
+ $result = " * OK: found hostname '$hostname' in <hosts> section of opensrf.xml\n";
+ }
+ print $result unless $he;
+ $output .= $result;
+ }
}
sub check_libdbd {
- my $results = '';
- my @location = `/sbin/ldconfig --print | grep libdbdpgsql`; # simple(ton) attempt to filter out build versions
+ my $results = '';
+ my @location = `/sbin/ldconfig --print | grep libdbdpgsql`; # simple(ton) attempt to filter out build versions
unless(@location) {
- # This is pretty distro-specific, but let's worry about other distros and operating systems when we get there
+ # This is pretty distro-specific, but let's worry about other distros and operating systems when we get there
my $res = "libdbi PostgreSQL driver not found in shared library path;
you may need to edit /etc/ld.so.conf or add an entry to /etc/ld.so.conf.d/
and run 'ldconfig' as root\n";
print $res;
return $res;
}
- if ($location[0] !~ m#/usr/local/lib/dbd/#) {
- my $res = "libdbdpgsql.so was not found in /usr/local/libdbi/dbd/
+ if ($location[0] !~ m#/usr/local/lib/dbd/#) {
+ my $res = "libdbdpgsql.so was not found in /usr/local/libdbi/dbd/
We have found that system packages don't link against libdbi.so;
therefore, we strongly recommend compiling libdbi and libdbi-drivers from source.\n";
- $results .= $res;
- print $res;
- }
- if ($results eq '') {
- $results = " * OK - found locally installed libdbi.so and libdbdpgsql.so in shared library path\n";
- print $results;
- }
- return $results;
+ $results .= $res;
+ print $res;
+ }
+ if ($results eq '') {
+ $results = " * OK - found locally installed libdbi.so and libdbdpgsql.so in shared library path\n";
+ print $results;
+ }
+ return $results;
}
sub get_debug_info {
- my $temp_dir = shift; # place we can write files
- my $log = shift; # location of the log directory
- my $config = shift; # location of the config files
- my $perl_test = shift; # output from the Perl prereq testing
- my $config_test = shift; # output from the config file testing
-
- my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
- my $oils_time = sprintf("%04d-%02d-%02d_%02dh-%02d-%02d", $year+1900, $mon, $mday, $hour, $min, $sec);
-
- # evil approach that requires no other Perl dependencies
- chdir($temp_dir);
- my $oils_debug_dir = "$temp_dir/oils_$oils_time";
-
- # Replace with something Perlish
- mkdir($oils_debug_dir) or die $!;
-
- # Replace with File::Copy
- system("cp $log/*log $oils_debug_dir");
-
- # Passwords will go through in the clear for now
- system("cp $config/*xml $oils_debug_dir");
-
- # Get Perl output
- open(FH, ">", "$oils_debug_dir/perl_test.out") or die $!;
- print FH $perl_test;
- close(FH);
-
- # Get XML output
- open(FH, ">", "$oils_debug_dir/xml_test.out") or die $!;
- print FH $config_test;
- close(FH);
-
- # Tar this up - does any system not have tar?
- system("tar czf oils_$oils_time.tar.gz oils_$oils_time");
-
- # Clean up after ourselves, somewhat dangerously
- system("rm -fr $oils_debug_dir");
-
- print "Wrote your debug information to $temp_dir/oils_$oils_time.tar.gz.\n";
+ my $temp_dir = shift; # place we can write files
+ my $log = shift; # location of the log directory
+ my $config = shift; # location of the config files
+ my $perl_test = shift; # output from the Perl prereq testing
+ my $config_test = shift; # output from the config file testing
+
+ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+ my $oils_time = sprintf("%04d-%02d-%02d_%02dh-%02d-%02d", $year+1900, $mon, $mday, $hour, $min, $sec);
+
+ # evil approach that requires no other Perl dependencies
+ chdir($temp_dir);
+ my $oils_debug_dir = "$temp_dir/oils_$oils_time";
+
+ # Replace with something Perlish
+ mkdir($oils_debug_dir) or die $!;
+
+ # Replace with File::Copy
+ system("cp $log/*log $oils_debug_dir");
+
+ # Passwords will go through in the clear for now
+ system("cp $config/*xml $oils_debug_dir");
+
+ # Get Perl output
+ open(FH, ">", "$oils_debug_dir/perl_test.out") or die $!;
+ print FH $perl_test;
+ close(FH);
+
+ # Get XML output
+ open(FH, ">", "$oils_debug_dir/xml_test.out") or die $!;
+ print FH $config_test;
+ close(FH);
+
+ # Tar this up - does any system not have tar?
+ system("tar czf oils_$oils_time.tar.gz oils_$oils_time");
+
+ # Clean up after ourselves, somewhat dangerously
+ system("rm -fr $oils_debug_dir");
+
+ print "Wrote your debug information to $temp_dir/oils_$oils_time.tar.gz.\n";
}
__DATA__
commit 6fdbecf11a7999d62a869f48e78aecf1f74aaf5e
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Oct 13 22:13:02 2011 -0400
Remove oils_web.xml test from settings-tester.pl
In master, oils_web.xml is no more, replaced instead by Apache
configuration. Awww yeah.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/support-scripts/settings-tester.pl b/Open-ILS/src/support-scripts/settings-tester.pl
index c82eb80..094010d 100755
--- a/Open-ILS/src/support-scripts/settings-tester.pl
+++ b/Open-ILS/src/support-scripts/settings-tester.pl
@@ -80,18 +80,6 @@ $output .= check_libdbd();
check_hostname();
-# Check for oils_web.xml, required for acquisitions and many administration
-# interfaces as of Evergreen 1.6
-if (!-T '/openils/conf/oils_web.xml') {
- my $de = "* WARNING: As of Evergreen 1.6, /openils/conf/oils_web.xml " .
- "is a required configuration file. Copying " .
- "/openils/conf/oils_web.xml.example should resolve this " .
- "problem.\n";
- $output .= $de;
- warn $de;
-}
-
-
if ($gather) {
get_debug_info( $tmpdir, $log_dir, $conf_dir, $perloutput, $output );
}
commit debb295184b26018a0087ac60f54f7eaf7b837de
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Oct 13 22:10:23 2011 -0400
Modernize settings-tester.pl a bit
* Add a section that checks for Evergreen services in opensrf_core.xml
* Ignore the qstore database credentials, as qstore is unused currently
* Split things off into subroutines for easier reading
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/support-scripts/settings-tester.pl b/Open-ILS/src/support-scripts/settings-tester.pl
index a59dca9..c82eb80 100755
--- a/Open-ILS/src/support-scripts/settings-tester.pl
+++ b/Open-ILS/src/support-scripts/settings-tester.pl
@@ -1,8 +1,8 @@
#!/usr/bin/perl
-# vim:noet:ts=4:
+# vim:et:ts=4:
use strict;
use warnings;
-use Test::More tests => 5;
+use Test::More tests => 4;
use Error qw(:try);
use_ok( 'OpenSRF::Utils::Config' );
@@ -65,148 +65,20 @@ my $logfile = $conf->bootstrap->logfile;
my $xmlparser = XML::LibXML->new();
my $confxml = $xmlparser->parse_file($core_config);
my $confxpc = XML::LibXML::XPathContext->new($confxml);
-
-foreach my $section (qw/opensrf gateway/) {
- my $j_username = $confxpc->find("/config/$section/username");
- my $j_password = $confxpc->find("/config/$section/passwd");
- my $j_port = $confxpc->find("/config/$section/port");
- # We should check for a domains element to catch likely upgrade errors
- my $j_domain = $confxpc->find("/config/$section/domain");
- check_jabber($j_username, $j_password, $j_domain, $j_port);
-}
-
-my @routers = $confxpc->findnodes("/config/routers/router");
-foreach my $router (@routers) {
- my $j_username = $router->findvalue("./transport/username");
- my $j_password = $router->findvalue("./transport/password");
- my $j_port = $router->findvalue("./transport/port");
- # We should check for a domains element to catch likely upgrade errors
- my $j_domain = $router->findvalue("./transport/server");
- check_jabber($j_username, $j_password, $j_domain, $j_port);
-}
-
my $osrfxml = $xmlparser->parse_file($settings_config);
-print "\nChecking database connections\n";
-# Check database connections
-my @databases = $osrfxml->findnodes('//database');
-
-# If we have no database connections, this is probably the OpenSRF version
-# of opensrf.xml
-if (!@databases) {
- my $de = "* WARNING: There are no database connections defined in " .
- "opensrf.xml. These are defined in services such as " .
- "open-ils.cstore and open-ils.reporter. Please ensure that " .
- "your opensrf_core.xml and opensrf.xml configuration files " .
- "are based on the examples shipped with Evergreen instead of " .
- "OpenSRF.\n";
- $output .= $de;
- warn $de;
-}
-foreach my $database (@databases) {
- my $db_name = $database->findvalue("./db");
- if (!$db_name) {
- $db_name = $database->findvalue("./name");
- }
- my $db_host = $database->findvalue("./host");
- my $db_port = $database->findvalue("./port");
- my $db_user = $database->findvalue("./user");
- my $db_pw = $database->findvalue("./pw");
- if (!$db_pw && $database->parentNode->parentNode->nodeName eq 'reporter') {
- $db_pw = $database->findvalue("./password");
- if ($db_pw) {
- my $de = "* WARNING: Deprecated <password> element used for the " .
- "<reporter> entry. Please use <pw> instead.\n";
- $output .= $de;
- warn $de;
- }
- }
-
- my $osrf_xpath;
- foreach my $node ($database->findnodes("ancestor::node()")) {
- next unless $node->nodeType == XML::LibXML::XML_ELEMENT_NODE;
- $osrf_xpath .= "/" . $node->nodeName;
- }
- $output .= test_db_connect($db_name, $db_host, $db_port, $db_user, $db_pw, $osrf_xpath);
-}
+check_opensrf_core();
+check_all_jabber();
+check_all_database_connections();
+check_database_drivers();
print "\nChecking postgresql version\n";
system ("psql", "--version");
-print "\nChecking database drivers to ensure <driver> matches <language>\n";
-# Check database drivers
-# if language eq 'C', driver eq 'pgsql'
-# if language eq 'perl', driver eq 'Pg'
-my @drivers = $osrfxml->findnodes('//driver');
-foreach my $driver_node (@drivers) {
- my $language;
- my $driver_xpath;
- my @driver_xpath_nodes;
- foreach my $node ($driver_node->findnodes("ancestor::node()")) {
- next unless $node->nodeType == XML::LibXML::XML_ELEMENT_NODE;
- $driver_xpath .= "/" . $node->nodeName;
- push @driver_xpath_nodes, $node->nodeName;
- }
- my $lang_xpath;
- my $driver = $driver_node->findvalue("child::text()");
- while (pop(@driver_xpath_nodes) && scalar(@driver_xpath_nodes) > 0 && !$language) {
- $lang_xpath = "/" . join('/', @driver_xpath_nodes) . "/language";
- my @lang_nodes = $osrfxml->findnodes($lang_xpath);
- next unless scalar(@lang_nodes > 0);
- $language = $lang_nodes[0]->findvalue("child::text()");
- }
- if ($driver eq "pgsql") {
- if ($driver_xpath =~ m#/reporter/#) {
- $result = "* ERROR: reporter application must use driver 'Pg', but '$driver' is defined\n";
- warn $result;
- } elsif ($language eq "C") {
- $result = "* OK: $driver language is $language in $lang_xpath\n";
- } else {
- $result = "* ERROR: $driver language is $language in $lang_xpath\n";
- warn $result;
- }
- } elsif ($driver eq "Pg") {
- if ($driver_xpath =~ m#/reporter/#) {
- $result = "* OK: $driver language is undefined for reporter base configuration\n";
- } elsif ($language eq "perl") {
- $result = "* OK: $driver language is $language in $lang_xpath\n";
- } else {
- $result = "* ERROR: $driver language is $language in $lang_xpath\n";
- warn $result;
- }
-
- } elsif ($driver eq "SIP") {
- $result = "* OK SIP from telephony section. \n";
- warn $result;
- } else {
- $result = "* ERROR: Unknown driver $driver in $driver_xpath\n";
- warn $result;
- }
- print $result;
- $output .= $result;
-}
-
print "\nChecking libdbi and libdbi-drivers\n";
$output .= check_libdbd();
-print "\nChecking hostname\n";
-my @hosts = $osrfxml->findnodes('/opensrf/hosts/*');
-foreach my $host (@hosts) {
- next unless $host->nodeType == XML::LibXML::XML_ELEMENT_NODE;
- my $osrfhost = $host->nodeName;
- my $he;
- if ($osrfhost ne $hostname && $osrfhost ne "localhost") {
- $result = " * ERROR: expected hostname '$hostname', found '$osrfhost' in <hosts> section of opensrf.xml\n";
- warn $result;
- $he = 1;
- } elsif ($osrfhost eq "localhost") {
- $result = " * OK: found hostname 'localhost' in <hosts> section of opensrf.xml\n";
- } else {
- $result = " * OK: found hostname '$hostname' in <hosts> section of opensrf.xml\n";
- }
- print $result unless $he;
- $output .= $result;
-}
+check_hostname();
# Check for oils_web.xml, required for acquisitions and many administration
# interfaces as of Evergreen 1.6
@@ -224,6 +96,56 @@ if ($gather) {
get_debug_info( $tmpdir, $log_dir, $conf_dir, $perloutput, $output );
}
+sub check_all_database_connections {
+ print "\nChecking database connections\n";
+ # Check database connections
+ my @databases = $osrfxml->findnodes('//database');
+
+ # If we have no database connections, this is probably the OpenSRF version
+ # of opensrf.xml
+ if (!@databases) {
+ my $de = "* WARNING: There are no database connections defined in " .
+ "opensrf.xml. These are defined in services such as " .
+ "open-ils.cstore and open-ils.reporter. Please ensure that " .
+ "your opensrf_core.xml and opensrf.xml configuration files " .
+ "are based on the examples shipped with Evergreen instead of " .
+ "OpenSRF.\n";
+ $output .= $de;
+ warn $de;
+ }
+
+ foreach my $database (@databases) {
+ if ($database->parentNode->parentNode->localname eq 'open-ils.qstore') {
+ next;
+ }
+ my $db_name = $database->findvalue("./db");
+ if (!$db_name) {
+ $db_name = $database->findvalue("./name");
+ }
+ my $db_host = $database->findvalue("./host");
+ my $db_port = $database->findvalue("./port");
+ my $db_user = $database->findvalue("./user");
+ my $db_pw = $database->findvalue("./pw");
+ if (!$db_pw && $database->parentNode->parentNode->nodeName eq 'reporter') {
+ $db_pw = $database->findvalue("./password");
+ if ($db_pw) {
+ my $de = "* WARNING: Deprecated <password> element used for the " .
+ "<reporter> entry. Please use <pw> instead.\n";
+ $output .= $de;
+ warn $de;
+ }
+ }
+
+ my $osrf_xpath;
+ foreach my $node ($database->findnodes("ancestor::node()")) {
+ next unless $node->nodeType == XML::LibXML::XML_ELEMENT_NODE;
+ $osrf_xpath .= "/" . $node->nodeName;
+ }
+ $output .= test_db_connect($db_name, $db_host, $db_port, $db_user, $db_pw, $osrf_xpath);
+ }
+}
+
+
sub test_db_connect {
my ($db_name, $db_host, $db_port, $db_user, $db_pw, $osrf_xpath) = @_;
@@ -273,30 +195,129 @@ sub test_db_connect {
}
+sub check_database_drivers {
+ print "\nChecking database drivers to ensure <driver> matches <language>\n";
+ # Check database drivers
+ # if language eq 'C', driver eq 'pgsql'
+ # if language eq 'perl', driver eq 'Pg'
+ my @drivers = $osrfxml->findnodes('//driver');
+ foreach my $driver_node (@drivers) {
+ my $language;
+ my $driver_xpath;
+ my @driver_xpath_nodes;
+ foreach my $node ($driver_node->findnodes("ancestor::node()")) {
+ next unless $node->nodeType == XML::LibXML::XML_ELEMENT_NODE;
+ $driver_xpath .= "/" . $node->nodeName;
+ push @driver_xpath_nodes, $node->nodeName;
+ }
+ my $lang_xpath;
+ my $driver = $driver_node->findvalue("child::text()");
+ while (pop(@driver_xpath_nodes) && scalar(@driver_xpath_nodes) > 0 && !$language) {
+ $lang_xpath = "/" . join('/', @driver_xpath_nodes) . "/language";
+ my @lang_nodes = $osrfxml->findnodes($lang_xpath);
+ next unless scalar(@lang_nodes > 0);
+ $language = $lang_nodes[0]->findvalue("child::text()");
+ }
+ if ($driver eq "pgsql") {
+ if ($driver_xpath =~ m#/reporter/#) {
+ $result = "* ERROR: reporter application must use driver 'Pg', but '$driver' is defined\n";
+ warn $result;
+ } elsif ($language eq "C") {
+ $result = "* OK: $driver language is $language in $lang_xpath\n";
+ } else {
+ $result = "* ERROR: $driver language is $language in $lang_xpath\n";
+ warn $result;
+ }
+ } elsif ($driver eq "Pg") {
+ if ($driver_xpath =~ m#/reporter/#) {
+ $result = "* OK: $driver language is undefined for reporter base configuration\n";
+ } elsif ($language eq "perl") {
+ $result = "* OK: $driver language is $language in $lang_xpath\n";
+ } else {
+ $result = "* ERROR: $driver language is $language in $lang_xpath\n";
+ warn $result;
+ }
+
+ } elsif ($driver eq "SIP") {
+ $result = "* OK SIP from telephony section. \n";
+ warn $result;
+ } else {
+ $result = "* ERROR: Unknown driver $driver in $driver_xpath\n";
+ warn $result;
+ }
+ print $result;
+ $output .= $result;
+ }
+}
+
+sub check_opensrf_core {
+ print "\nChecking $core_config for Evergreen services:\n";
+ my @public_services = $confxpc->findnodes("//services/service");
+ my $found_eg_service = 0;
+ foreach my $service (@public_services) {
+ if ($service->firstChild->nodeValue eq 'open-ils.auth') {
+ $found_eg_service = 1;
+ }
+ }
+ if ($found_eg_service) {
+ my $found .= "* OK: Found a public Evergreen service in $core_config\n";
+ print $found;
+ $output .= $found;
+ } else {
+ my $err = "* WARNING: No public Evergreen services were found in " .
+ "$core_config; this means that you are probably still using " .
+ "the version that ships with OpenSRF. Please use the " .
+ "opensrf.xml.example file that ships with Evergreen.\n";
+ $output .= $err;
+ warn $err;
+ }
+}
+
sub check_db_langs {
- my $langs = shift;
+ my $langs = shift;
- my $errors;
+ my $errors;
- # Ensure the following PostgreSQL languages have been enabled
- my %languages = (
- 'plperl' => 0,
- 'plperlu' => 0,
- 'plpgsql' => 0,
- );
+ # Ensure the following PostgreSQL languages have been enabled
+ my %languages = (
+ 'plperl' => 0,
+ 'plperlu' => 0,
+ 'plpgsql' => 0,
+ );
- foreach my $lang (@$langs) {
- my $lower = lc($$lang[0]);
- $languages{$lower} = 1;
- }
-
- foreach my $lang (keys %languages) {
- if (!$languages{$lang}) {
- $errors .= " * ERROR: Language '$lang' is not enabled in the target database\n";
- }
- }
+ foreach my $lang (@$langs) {
+ my $lower = lc($$lang[0]);
+ $languages{$lower} = 1;
+ }
+
+ foreach my $lang (keys %languages) {
+ if (!$languages{$lang}) {
+ $errors .= " * ERROR: Language '$lang' is not enabled in the target database\n";
+ }
+ }
+
+ return $errors;
+}
+
+sub check_all_jabber {
+ foreach my $section (qw/opensrf gateway/) {
+ my $j_username = $confxpc->find("/config/$section/username");
+ my $j_password = $confxpc->find("/config/$section/passwd");
+ my $j_port = $confxpc->find("/config/$section/port");
+ # We should check for a domains element to catch likely upgrade errors
+ my $j_domain = $confxpc->find("/config/$section/domain");
+ check_jabber($j_username, $j_password, $j_domain, $j_port);
+ }
- return $errors;
+ my @routers = $confxpc->findnodes("/config/routers/router");
+ foreach my $router (@routers) {
+ my $j_username = $router->findvalue("./transport/username");
+ my $j_password = $router->findvalue("./transport/password");
+ my $j_port = $router->findvalue("./transport/port");
+ # We should check for a domains element to catch likely upgrade errors
+ my $j_domain = $router->findvalue("./transport/server");
+ check_jabber($j_username, $j_password, $j_domain, $j_port);
+ }
}
sub check_jabber {
@@ -328,6 +349,27 @@ sub check_jabber {
$output .= ($je) ? $je : "* Jabber successfully connected\n";
}
+sub check_hostname {
+ print "\nChecking hostname\n";
+ my @hosts = $osrfxml->findnodes('/opensrf/hosts/*');
+ foreach my $host (@hosts) {
+ next unless $host->nodeType == XML::LibXML::XML_ELEMENT_NODE;
+ my $osrfhost = $host->nodeName;
+ my $he;
+ if ($osrfhost ne $hostname && $osrfhost ne "localhost") {
+ $result = " * ERROR: expected hostname '$hostname', found '$osrfhost' in <hosts> section of opensrf.xml\n";
+ warn $result;
+ $he = 1;
+ } elsif ($osrfhost eq "localhost") {
+ $result = " * OK: found hostname 'localhost' in <hosts> section of opensrf.xml\n";
+ } else {
+ $result = " * OK: found hostname '$hostname' in <hosts> section of opensrf.xml\n";
+ }
+ print $result unless $he;
+ $output .= $result;
+ }
+}
+
sub check_libdbd {
my $results = '';
my @location = `/sbin/ldconfig --print | grep libdbdpgsql`; # simple(ton) attempt to filter out build versions
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/support-scripts/settings-tester.pl | 677 ++++++++++++-----------
1 files changed, 355 insertions(+), 322 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list