Changeset 34009

Timestamp:

Jun 13, 2012, 4:46:33 PM (14 years ago)

Author:

mhuber

Message:

merged adding DBSERVER use instead of hardcoded name

Location:

tags/ipp-20120531

Files:

• ippScripts/scripts/nightly_science.pl (modified) (1 diff, 1 prop)
• tools/regpeek.pl (modified) (2 diffs, 1 prop)

tags/ipp-20120531/ippScripts/scripts/nightly_science.pl

@@ -2052 +2052 @@
 
 sub init_gpc_db {
+    ## change to use the site.config setting, however may want to use replicated scidbs instead
+    my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
+    my $siteConfig = $ipprc->{_siteConfig};
     use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
-    my $dbserver = 'ippdb01';
+    # my $dbserver = 'ippdb01';
     my $dbuser = 'ippuser';
     my $dbpass = 'ippuser';
+    my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
+    die "database configuration not set up" unless defined($dbserver);
     $db = DBI->connect("DBI:mysql:database=${dbname};host=${dbserver};" .
                        "mysql_socket=" . DB_SOCKET(),

tags/ipp-20120531/tools/regpeek.pl

@@ -3 +3 @@
 use DBI;
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
+use PS::IPP::Config 1.0.1 qw( :standard );
 
 my $dbname = 'gpc1';
@@ -65 +66 @@
 
 sub init_gpc_db {
+    ## change to use the site.config setting now, however may want to use replicated scidbs instead
+    my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
+    my $siteConfig = $ipprc->{_siteConfig};
     use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
-    my $dbserver = 'ippdb01';
+    # my $dbserver = 'ippdb01';
     my $dbuser = 'ippuser';
     my $dbpass = 'ippuser';
+    my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
+    die "database configuration not set up" unless defined($dbserver);
     $db = DBI->connect("DBI:mysql:database=${dbname};host=${dbserver};" .
                        "mysql_socket=" . DB_SOCKET(),
                        ${dbuser},${dbpass},
-{ RaiseError => 1, AutoCommit => 1}
+                       { RaiseError => 1, AutoCommit => 1}
         ) or die "Unable to connect to database $DBI::errstr\n";
 return($db);