Changeset 34018

Timestamp:

Jun 15, 2012, 1:21:25 PM (14 years ago)

Author:

mhuber

Message:

adding change for readonly DBSERVER,DBUSER,DBPASSWORD use instead of being hardcoded

Location:

trunk

Files:

• ippScripts/scripts/nightly_science.pl (modified) (2 diffs)
• tools/regpeek.pl (modified) (2 diffs)

trunk/ippScripts/scripts/nightly_science.pl

@@ -32 +32 @@
     exit($PS_EXIT_CONFIG_ERROR);
 }
+
+## for DB connection, want to use siteConfig DB settings
+my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
+my $siteConfig = $ipprc->{_siteConfig};
 
 my $db;
@@ -2052 +2056 @@
 
 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};
+    ## change to use the siteConfig setting, while readonly probably do not want to use a readonly replicated DB incase it gets behind
+    my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
+    my $dbuser = metadataLookupStr($ipprc->{_siteConfig}, "RO_DBUSER");
+    my $dbpass = metadataLookupStr($ipprc->{_siteConfig}, "RO_DBPASSWORD");
+    die "database configuration not set up" unless defined($dbserver);
+    die "database configuration not set up" unless defined($dbuser);
+    die "database configuration not set up" unless defined($dbpass);
+    #my $dbserver = 'ippdb01';
+    #my $dbuser = 'ippuser';
+    #my $dbpass = 'ippuser';
     use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
-    # 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(),

trunk/tools/regpeek.pl

@@ -4 +4 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use PS::IPP::Config 1.0.1 qw( :standard );
+
+my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
+my $siteConfig = $ipprc->{_siteConfig};
 
 my $dbname = 'gpc1';
@@ -66 +69 @@
 
 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};
+    ## change to use the siteConfig setting, while readonly probably do not want to use a readonly replicated DB incase it gets behind
     use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
-    # my $dbserver = 'ippdb01';
-    my $dbuser = 'ippuser';
-    my $dbpass = 'ippuser';
+    #my $dbserver = 'ippdb01';
+    #my $dbuser = 'ippuser';
+    #my $dbpass = 'ippuser';
     my $dbserver = metadataLookupStr($siteConfig, 'DBSERVER');
+    my $dbuser = metadataLookupStr($ipprc->{_siteConfig}, "RO_DBUSER");
+    my $dbpass = metadataLookupStr($ipprc->{_siteConfig}, "RO_DBPASSWORD");
     die "database configuration not set up" unless defined($dbserver);
+    die "database configuration not set up" unless defined($dbuser);
+    die "database configuration not set up" unless defined($dbpass);
     $db = DBI->connect("DBI:mysql:database=${dbname};host=${dbserver};" .
                        "mysql_socket=" . DB_SOCKET(),