Changeset 34041 for branches/meh_branches/ppstack_test/ippScripts/scripts/nightly_science.pl

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippScripts/scripts/nightly_science.pl (modified) (6 diffs)

branches/meh_branches/ppstack_test/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;
@@ -1539 +1543 @@
             $cmd .= " -simple  -set_label $label -exp_id $input_exp_id -template_exp_id $template_exp_id ";
 #               $cmd .= " -pretend ";
+            if (defined($reduction)) {
+                $cmd .= " -set_reduction $reduction ";
+            }
+
             if (defined($pretend)) {
                 $cmd .= ' -pretend ';
@@ -1670 +1678 @@
             $cmd .= "-set_workdir $workdir  -set_dist_group $dist_group  -set_data_group $new_data_group ";
             $cmd .= " -simple  -set_label $label -exp_id $input_exp_id -template_exp_id $template_exp_id ";
+            if (defined($reduction)) {
+                $cmd .= " -set_reduction $reduction ";
+            }
+
 #               $cmd .= " -pretend ";
             if (defined($pretend)) {
@@ -1724 +1736 @@
     $check_cmd .= " -pretend -simple  -rerun -set_label $label -filter $filter ";
     $check_cmd .= " -dateobs_begin ${lunation_start}T00:00:00 -dateobs_end ${lunation_end}T23:59:59 -distance 1.5 ";
+    if (defined($reduction)) {
+        $check_cmd .= " -set_reduction $reduction ";
+    }
 
     my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 
@@ -1745 +1760 @@
             $cmd .= " -simple  -rerun -set_label $label -filter $filter ";
             $cmd .= " -dateobs_begin ${lunation_start}T00:00:00 -dateobs_end ${lunation_end}T23:59:59 -distance 1.5 ";
+            if (defined($reduction)) {
+                $cmd .= " -set_reduction $reduction ";
+            }
 
             if (defined($pretend)) {
@@ -2038 +2056 @@
 
 sub init_gpc_db {
+    ## 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';
     $db = DBI->connect("DBI:mysql:database=${dbname};host=${dbserver};" .
                        "mysql_socket=" . DB_SOCKET(),