Changeset 28715

Timestamp:

Jul 26, 2010, 12:06:32 PM (16 years ago)

Author:

rhenders

Message:

Checking for Db server error when grabbing labels

Location:

trunk/tools

Files:

• czartool/CzarDb.pm (modified) (2 diffs)
• roboczar.pl (modified) (3 diffs)

trunk/tools/czartool/CzarDb.pm

@@ -34 +34 @@
 ###########################################################################
 sub getCurrentLabels {
-    my ($self, $server) = @_;
+    my ($self, $server, $labels) = @_;
 
     my $query = $self->{_db}->prepare(<<SQL);
@@ -43 +43 @@
 SQL
 
-    $query->execute;
-
-    return $query->fetchall_arrayref();
+
+    if (!$query->execute) {
+
+        print "WARNING: getCurrentLabels() failed\n";
+        return 0;
+    }
+
+    ${$labels} = $query->fetchall_arrayref();
+
+    return 1;
 }
 

trunk/tools/roboczar.pl

@@ -86 +86 @@
     my $reverting = 0;
     my $server = undef;
-
-    my $rows = undef; # TODO just call label
-        my $row;
+    my $rows = undef;
+    my $row = undef;
 
     while (1) {
@@ -94 +93 @@
         updateServerStatus();
         updateLabels();
-        $rows = $czarDb->getCurrentLabels("stdscience");
+        if (!$czarDb->getCurrentLabels("stdscience", \$rows)) {next;}
 
         foreach $stage (@stages) {
-            $totalNew=$totalFaults=$totalFull=0;
 
             $server = $pantasks->getServerForThisStage($stage);
@@ -105 +103 @@
             print "* Checking labels for $stage stage\n";
 
+            $totalNew=$totalFaults=$totalFull=0;
             foreach $row ( @{$rows} ) {
                 my ($label) = @{$row};