Changeset 34010

Timestamp:

Jun 13, 2012, 4:55:11 PM (14 years ago)

Author:

mhuber

Message:

adding DBSERVER use instead of hardcoded name

Location:

trunk/ippScripts/scripts

Files:

• automate_stacks.pl (modified) (1 diff)
• bundle_detrends.pl (modified) (1 diff)
• make_burntool_pcontrol.pl (modified) (1 diff)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -1588 +1588 @@
 
 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 set up" unless defined($dbserver);
     $db = DBI->connect("DBI:mysql:database=${dbname};host=${dbserver};" .
                        "mysql_socket=" . DB_SOCKET(),

trunk/ippScripts/scripts/bundle_detrends.pl

@@ -128 +128 @@
 
 sub init_gpc_db {
+    ## change to use the site.config setting now, however may want to use replicated scidbs instead
+    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 set up" unless defined($dbserver);
     $db = DBI->connect("DBI:mysql:database=${dbname};host=${dbserver};" .
                        "mysql_socket=" . DB_SOCKET(),

trunk/ippScripts/scripts/make_burntool_pcontrol.pl

@@ -29 +29 @@
 
 # Load database
+## change to use the site.config setting now
 $dbname = 'gpc1';
-$dbserver = 'ippdb01';
+#$dbserver = 'ippdb01';
 $dbuser = 'ipp';
 $dbpass = 'ipp';
+my $ipprc =  PS::IPP::Config->new(); # IPP Configuration
+my $siteConfig = $ipprc->{_siteConfig};
+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(),