Changeset 38250 for trunk/ippMonitor/czartool/czarpoll.pl

Timestamp:

May 8, 2015, 10:49:55 AM (11 years ago)

Author:

bills

Message:

Initial work to support two IPP databases (gpc1 and gpc2). Plotting stuff
doesn't work but updates of the stage tables does

File:

• trunk/ippMonitor/czartool/czarpoll.pl (modified) (5 diffs)

trunk/ippMonitor/czartool/czarpoll.pl

@@ -32 +32 @@
 my $czarDb = $config->getCzarDbInstance();
 my $gpc1Db = $config->getGpc1Instance;
+my $gpc2Db = $config->getGpc2Instance;
 my $nebulous = new czartool::Nebulous($czarDb);
 my $pantasks = new czartool::Pantasks();
@@ -47 +48 @@
         "fullforce",
         "dist",
+        "fullforce",
         "pub");
 
@@ -331 +333 @@
 
     print "* Updating stage data\n";
-    my $totalNew = undef;
-    my $totalFaults = undef;
-    my $totalFull = undef;
+    my $totalNew1 = 0;
+    my $totalFaults1 = 0;
+    my $totalFull1 = 0;
+    my $totalNew2 = 0;
+    my $totalFaults2 = 0;
+    my $totalFull2 = 0;
     my $stage = undef;
     my $reverting = 0;
@@ -352 +357 @@
         print "* Checking labels for $stage stage\n";
 
-        $totalNew=$totalFaults=$totalFull=0;
+        $totalNew1=$totalFaults1=$totalFull1=0;
+        $totalNew2=$totalFaults2=$totalFull2=0;
         foreach $row ( @{$rows} ) {
             my ($label) = @{$row};
@@ -358 +364 @@
             chomp($label);
 
-            if ($stage eq "burntool") {
-
-                $new = $full = $faults = 0;
-                if ($labelServer eq "stdscience") {
-
-                    $full = $gpc1Db->countRegisteredExposures($label, $today);
-                }
-            }
-            else {
-
-                $new = $gpc1Db->countExposures($label, $stage, $newState);
-                $full = $gpc1Db->countExposures($label, $stage, "full");
-                $faults = $gpc1Db->countFaults($label, $stage, $newState);
-            }
+            $new = $gpc1Db->countExposures($label, $stage, $newState);
+            $full = $gpc1Db->countExposures($label, $stage, "full");
+            $faults = $gpc1Db->countFaults($label, $stage, $newState);
             #printf("%s  %s, %s, %d, %d\n", $labelServer, $label, $stage, $new, $faults);
-            $totalNew += $new;
-            $totalFull += $full;
-            $totalFaults += $faults;
-
-            $czarDb->insertNewTimeData($stage, $label, $new, $full, $faults);
-        }
-
-        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", $totalNew, $totalFull, $totalFaults);
-    }
-}
-
+            $totalNew1 += $new;
+            $totalFull1 += $full;
+            $totalFaults1 += $faults;
+
+            $czarDb->insertNewTimeData($stage, $label, 'gpc1', $new, $full, $faults);
+
+            $new = $gpc2Db->countExposures($label, $stage, $newState);
+            $full = $gpc2Db->countExposures($label, $stage, "full");
+            $faults = $gpc2Db->countFaults($label, $stage, $newState);
+            #printf("%s  %s, %s, %d, %d\n", $labelServer, $label, $stage, $new, $faults);
+            $totalNew2 += $new;
+            $totalFull2 += $full;
+            $totalFaults2 += $faults;
+
+            $czarDb->insertNewTimeData($stage, $label, 'gpc2', $new, $full, $faults);
+        }
+
+        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc1', $totalNew1, $totalFull1, $totalFaults1);
+        $czarDb->insertNewTimeData($stage, "all_".$labelServer."_labels", 'gpc2', $totalNew2, $totalFull2, $totalFaults2);
+    }
+}
+